tree 2eb5335924f63c5264fa2775ced50f68b9715299
parent 83b6e4b937a2197198cefffecca94c919f9aa8cf
parent bcb433b43acb424ff7bc6afab03ce12d8cc9a198
author Narayan Kamath <narayan@google.com> 1392931689 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392931689 +0000

am bcb433b4: am b1903653: am 128599e4: am 2b3c14bf: Merge "libandroidfw: fix build error for 64-bit"

* commit 'bcb433b43acb424ff7bc6afab03ce12d8cc9a198':
  libandroidfw: fix build error for 64-bit