am e4b3c7a3: Merge "Correct typo"

* commit 'e4b3c7a31d9647b468384668d2cee88295464a71':
  Correct typo
This commit is contained in:
Andrew Hsieh
2012-12-12 15:22:41 -08:00
committed by Android Git Automerger
3 changed files with 3 additions and 3 deletions

View File

@@ -15,7 +15,7 @@ object files. They have the following names and usage:
crtbegin_static.[cS]
This file contains a tiny ELF startup entry point (named '_start')
that is linked into every Android _static_ executable. These binaries can
run on any Linux ARM system, but cannot perform dynamic linking at all.
run on any Linux system, but cannot perform dynamic linking at all.
Note that the kernel calls the '_start' entry point directly when it
launches such an executable. The _start stub is used to call the

View File

@@ -29,7 +29,7 @@ extern "C" {
#define ANDROID_BITMAP_RESULT_JNI_EXCEPTION -2
#define ANDROID_BITMAP_RESULT_ALLOCATION_FAILED -3
/* Backward compatibility: this macro used to be mispelt. */
/* Backward compatibility: this macro used to be misspelled. */
#define ANDROID_BITMAP_RESUT_SUCCESS ANDROID_BITMAP_RESULT_SUCCESS
enum AndroidBitmapFormat {

View File

@@ -28,7 +28,7 @@ __BEGIN_DECLS
#define ANDROID_BITMAP_RESULT_JNI_EXCEPTION -2
#define ANDROID_BITMAP_RESULT_ALLOCATION_FAILED -3
/* Backward compatibility: this macro used to be mispelt. */
/* Backward compatibility: this macro used to be misspelled. */
#define ANDROID_BITMAP_RESUT_SUCCESS ANDROID_BITMAP_RESULT_SUCCESS
enum AndroidBitmapFormat {