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