tree 739f524fc553d4aa88099602a5299fa729cff3a7
parent 638ab1b58820a78a8e30ce8df6a8f9a97b92d503
parent 4743ee448ea070bb886a6045d7044074c083adb1
author Nick Kralevich <nnk@google.com> 1405218341 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405218341 +0000

am 4743ee44: am eac3f9ec: am add7e67f: am 24fa31b2: am 36fe6994: Merge "fix arm64 build" into jb-dev

* commit '4743ee448ea070bb886a6045d7044074c083adb1':
  fix arm64 build