tree bc494022de5859e096092d63aaffceed5cc2b018
parent a7281ee11a27d5fa3d9fa62eb8d2c6465007eb50
parent e523889332b88348e673137d272854278acbef8f
author Mark Salyzyn <salyzyn@google.com> 1397253808 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397253808 +0000

am e5238893: Merge "Fix aosp_arm64 mirror-aosp-master build 1119326"

* commit 'e523889332b88348e673137d272854278acbef8f':
  Fix aosp_arm64 mirror-aosp-master build 1119326