tree 97ad9f2723529c8857c21d0ec33ba8963fdff1d2
parent 2fb1fa6c88901fd16f1756a744a5f066f95c9253
parent 6191044729b2dace9c9b4b15b19a8839377d8973
author Narayan Kamath <narayan@google.com> 1393001908 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393001908 +0000

am 61910447: am 7942397b: am 19256340: am 22c66639: Merge "Fixes for 64bit in libhwui"

* commit '6191044729b2dace9c9b4b15b19a8839377d8973':
  Fixes for 64bit in libhwui