tree 471a2410e91bcabb4c85cb2aebe9692800b83eb3
parent 137f4bc879e35563463c3eef7f217030e6e952d1
parent 4ced8c12f9e18a72f120ffef58f9f427ea7b8c10
author Ian Rogers <irogers@google.com> 1400104470 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400104470 +0000

am 4ced8c12: am fc265f47: am 5493f0b5: Merge "64-bit build fix."

* commit '4ced8c12f9e18a72f120ffef58f9f427ea7b8c10':
  64-bit build fix.