| commit | 15edd80a696c1b5243874f7db9ef2d753016ade8 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Oct 01 18:21:35 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 01 18:21:35 2012 -0700 |
| tree | 42e4b8762508ff27010a82ee8b52485b3eded8d9 | |
| parent | baa7ee0370fcb88625a666141431a4187c0f91b2 [diff] | |
| parent | 39d7c6072dc4d587c32405f3c7de12e60559cfc8 [diff] |
am 39d7c607: am 75f43525: Merge "Always take GCC\'s definition of NULL." * commit '39d7c6072dc4d587c32405f3c7de12e60559cfc8': Always take GCC's definition of NULL.