summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2012-12-15 21:23:12 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-12-15 21:23:12 -0800
commit4bb20303d95e7d6242e648ce506ab939420dbe71 (patch)
tree9df9ff45df3201c0460ba0cffd4862c7e75f021a
parent0c6fff72f78e4f80b28ccccac9584255591dd1a2 (diff)
parent670c570e75e399432e96c9fd1dfa3fb92869f10c (diff)
downloadframeworks_native-4bb20303d95e7d6242e648ce506ab939420dbe71.zip
frameworks_native-4bb20303d95e7d6242e648ce506ab939420dbe71.tar.gz
frameworks_native-4bb20303d95e7d6242e648ce506ab939420dbe71.tar.bz2
am 670c570e: Merge "Fix typo"
* commit '670c570e75e399432e96c9fd1dfa3fb92869f10c': Fix typo
-rw-r--r--include/android/bitmap.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/android/bitmap.h b/include/android/bitmap.h
index 5078277..408386a 100644
--- a/include/android/bitmap.h
+++ b/include/android/bitmap.h
@@ -24,7 +24,7 @@
extern "C" {
#endif
-#define ANDROID_BITMAP_RESUT_SUCCESS 0
+#define ANDROID_BITMAP_RESULT_SUCCESS 0
#define ANDROID_BITMAP_RESULT_BAD_PARAMETER -1
#define ANDROID_BITMAP_RESULT_JNI_EXCEPTION -2
#define ANDROID_BITMAP_RESULT_ALLOCATION_FAILED -3