summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Narayan Kamath <narayan@google.com> 2015-01-06 10:09:59 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-01-06 10:09:59 +0000
commitf60b2d40b0b8dea2c83335c00fd7767008aa0abe (patch)
tree596c8fabd39d643ed7df371b0526ad16ae9b71fd
parentd38218d880f02951015733a3d3e00deb546465bf (diff)
parent024191b57f2165e4d0c2c579f95046d491feacb5 (diff)
am 024191b5: Merge "Fix comment. It should be \'or\' not \'of\'."
* commit '024191b57f2165e4d0c2c579f95046d491feacb5': Fix comment. It should be 'or' not 'of'.
-rw-r--r--core/jni/android/graphics/NinePatchImpl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android/graphics/NinePatchImpl.cpp b/core/jni/android/graphics/NinePatchImpl.cpp
index 4c589b703b80..26ce96728516 100644
--- a/core/jni/android/graphics/NinePatchImpl.cpp
+++ b/core/jni/android/graphics/NinePatchImpl.cpp
@@ -206,7 +206,7 @@ void NinePatch_Draw(SkCanvas* canvas, const SkRect& bounds,
src.fTop = 0;
dst.fTop = bounds.fTop;
// The first row always starts with the top being at y=0 and the bottom
- // being either yDivs[1] (if yDivs[0]=0) of yDivs[0]. In the former case
+ // being either yDivs[1] (if yDivs[0]=0) or yDivs[0]. In the former case
// the first row is stretchable along the Y axis, otherwise it is fixed.
// The last row always ends with the bottom being bitmap.height and the top
// being either yDivs[numYDivs-2] (if yDivs[numYDivs-1]=bitmap.height) or