tree f5fa2a679d4ecccab2770deee36d2b0aa4dc8d7a
parent 7c063e2fa838318ddd923fefc3fa8cde3c5bd80a
parent c532d091a7fb7d6f2c6743afde5a25428f8a75bc
author Nick Kralevich <nnk@google.com> 1405219533 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405219533 +0000

am c532d091: am 00190a74: am f6f701bf: am 31aa9e7d: am 7ba45d63: am 4743ee44: am eac3f9ec: am add7e67f: am 24fa31b2: am 36fe6994: Merge "fix arm64 build" into jb-dev

* commit 'c532d091a7fb7d6f2c6743afde5a25428f8a75bc':
  fix arm64 build