tree 6601e850bf0cf35c83af12f54e694682b2c115c1
parent 494ce1fc7f0cee59bf1cc0281c2e558aab15aed7
parent 7033730f508f5046771e4a768f8d24e825ac1cd7
author Ben Cheng <bccheng@google.com> 1356716837 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1356716837 -0800

am 7033730f: (-s ours) am 72a102cd: (-s ours) am c12c344d: (-s ours) Merge "[DO NOT MERGE] Add (void *) to make gcc 4.7 happy under strict-alias mode."

* commit '7033730f508f5046771e4a768f8d24e825ac1cd7':
  [DO NOT MERGE] Add (void *) to make gcc 4.7 happy under strict-alias mode.