summaryrefslogtreecommitdiffstats
path: root/core/jni/android
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2015-01-06 10:16:23 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-06 10:16:23 +0000
commit721d0994dc6ed370e359a33a6798f87389a428c8 (patch)
tree017f6517b4c5de1faa66c743e9ca3f917ad20b0c /core/jni/android
parent30a061ed4ffb7360d55b610566ce47b57c058543 (diff)
parentf60b2d40b0b8dea2c83335c00fd7767008aa0abe (diff)
downloadframeworks_base-721d0994dc6ed370e359a33a6798f87389a428c8.zip
frameworks_base-721d0994dc6ed370e359a33a6798f87389a428c8.tar.gz
frameworks_base-721d0994dc6ed370e359a33a6798f87389a428c8.tar.bz2
am f60b2d40: am 024191b5: Merge "Fix comment. It should be \'or\' not \'of\'."
* commit 'f60b2d40b0b8dea2c83335c00fd7767008aa0abe': Fix comment. It should be 'or' not 'of'.
Diffstat (limited to 'core/jni/android')
-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 4c589b7..26ce967 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