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
commitd8f2daada3a828c5d9e6dfa29f53ab054618e129 (patch)
tree5e1848779de1d34de0adef83ab341a9ed08516fa
parent4bb20303d95e7d6242e648ce506ab939420dbe71 (diff)
parentacfcd62aa9300087d3e8cca79e59b0abdcaaee35 (diff)
downloadframeworks_native-d8f2daada3a828c5d9e6dfa29f53ab054618e129.zip
frameworks_native-d8f2daada3a828c5d9e6dfa29f53ab054618e129.tar.gz
frameworks_native-d8f2daada3a828c5d9e6dfa29f53ab054618e129.tar.bz2
am acfcd62a: Merge "Revert "Fix typo""
* commit 'acfcd62aa9300087d3e8cca79e59b0abdcaaee35': Revert "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 408386a..5078277 100644
--- a/include/android/bitmap.h
+++ b/include/android/bitmap.h
@@ -24,7 +24,7 @@
extern "C" {
#endif
-#define ANDROID_BITMAP_RESULT_SUCCESS 0
+#define ANDROID_BITMAP_RESUT_SUCCESS 0
#define ANDROID_BITMAP_RESULT_BAD_PARAMETER -1
#define ANDROID_BITMAP_RESULT_JNI_EXCEPTION -2
#define ANDROID_BITMAP_RESULT_ALLOCATION_FAILED -3