tree 0a6c1aa9c9fdd56b106b6ffb29292ac95ff1afaf
parent b8b0302eea8f8a80f9893bc031099b4b35bd4922
parent a44f9a35a284c600616a7f2213a861ecdefd5615
author Brian Carlstrom <bdc@google.com> 1403048328 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403048328 +0000

am a44f9a35: am edbc4595: am d51730a6: Merge "Help catch common 32/64-bit errors."

* commit 'a44f9a35a284c600616a7f2213a861ecdefd5615':
  Help catch common 32/64-bit errors.