commit | 72a102cd15eaa3e89047ff92cdb313bd0dc7d3d4 | [log] [tgz] |
---|---|---|
author | Ben Cheng <bccheng@google.com> | Fri Dec 21 11:10:17 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 21 11:10:17 2012 -0800 |
tree | 5e4e114ed3c8550da8c8ed1c7998b438176840a4 | |
parent | d6da0b3e4c4dc9a66ff53ccc43739bf584c37efb [diff] | |
parent | c12c344ddffba520a28a19f2fe5a6aafe70b4b56 [diff] |
am c12c344d: (-s ours) Merge "[DO NOT MERGE] Add (void *) to make gcc 4.7 happy under strict-alias mode." * commit 'c12c344ddffba520a28a19f2fe5a6aafe70b4b56': [DO NOT MERGE] Add (void *) to make gcc 4.7 happy under strict-alias mode.