tree 5e4e114ed3c8550da8c8ed1c7998b438176840a4
parent d6da0b3e4c4dc9a66ff53ccc43739bf584c37efb
parent 72a102cd15eaa3e89047ff92cdb313bd0dc7d3d4
author Ben Cheng <bccheng@google.com> 1356117142 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1356117142 -0800

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 '72a102cd15eaa3e89047ff92cdb313bd0dc7d3d4':
  [DO NOT MERGE] Add (void *) to make gcc 4.7 happy under strict-alias mode.