tree 4fcf7fc917444a8540e06a00f0a00067afb8f50c
parent aee2a6eeaf13a4a8bd8bf015de16e02a507496e4
parent 7ba45d63aa8e8098eb21fd4081b23f5d5267f8b6
author Nick Kralevich <nnk@google.com> 1405218654 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405218654 +0000

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

* commit '7ba45d63aa8e8098eb21fd4081b23f5d5267f8b6':
  fix arm64 build