| commit | 820ad4283d71c4f2303f80d8ccbe6c90a6ec5407 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 16 14:23:56 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 16 14:23:56 2012 -0700 |
| tree | 0eefd1311f466ad71d94b95da3bb4a627d0c072b | |
| parent | 09d9dd3acdf74630eb7eb6896007e803085f45c6 [diff] | |
| parent | 74438bb22505b55ec72224932ae9982fbf9b4b65 [diff] |
am 74438bb2: am 449d4634: Merge "bionic: add macro protection for MALLOC_ALIGNMENT" * commit '74438bb22505b55ec72224932ae9982fbf9b4b65': bionic: add macro protection for MALLOC_ALIGNMENT