am acfcd62a: Merge "Revert "Fix typo""

* commit 'acfcd62aa9300087d3e8cca79e59b0abdcaaee35':
  Revert "Fix typo"
This commit is contained in:
Andrew Hsieh 2012-12-15 21:23:12 -08:00 committed by Android Git Automerger
commit d8f2daada3

View File

@ -24,7 +24,7 @@
extern "C" { extern "C" {
#endif #endif
#define ANDROID_BITMAP_RESULT_SUCCESS 0 #define ANDROID_BITMAP_RESUT_SUCCESS 0
#define ANDROID_BITMAP_RESULT_BAD_PARAMETER -1 #define ANDROID_BITMAP_RESULT_BAD_PARAMETER -1
#define ANDROID_BITMAP_RESULT_JNI_EXCEPTION -2 #define ANDROID_BITMAP_RESULT_JNI_EXCEPTION -2
#define ANDROID_BITMAP_RESULT_ALLOCATION_FAILED -3 #define ANDROID_BITMAP_RESULT_ALLOCATION_FAILED -3