tree 747058595b3e23c1d202f32efc9deceba5fbf101
parent b2235d5db74e26d6f3695eac672096d2cf430ade
parent 192563407964926537d688d4098054c3834341c0
author Narayan Kamath <narayan@google.com> 1394243481 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394243481 +0000

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

* commit '192563407964926537d688d4098054c3834341c0':
  Fixes for 64bit in libhwui