tree 5fe1cc0b30c9a6674f5a5df2a467191254325377
parent 6c925305091e6df5eacbb8eb5baaf2c63062a5d9
parent 936e87e12dd1335c6f773705fd0a7edb32bc4385
author Mark Salyzyn <salyzyn@google.com> 1397677870 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397677870 +0000

am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues"

* commit '936e87e12dd1335c6f773705fd0a7edb32bc4385':
  frameworks: 64 bit compile issues