tree bdf38d42ed4a302d381caa83b6816c619d7ad9c0
parent 6ced3b34f02f353c0d3445775132aa9cbf40b160
parent 5788722df7b73f1eff3edb95f2ead83d19603926
author Mark Salyzyn <salyzyn@google.com> 1397677331 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397677331 +0000

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

* commit '5788722df7b73f1eff3edb95f2ead83d19603926':
  frameworks: 64 bit compile issues