tree 16a15b50c6cc47a120ccae11a8bc8fbd2a9d3ae6
parent 0f37620e0f79bfab1354e2e3049c260342a2637e
parent b1b1e303d93a5c67eedeca6ef3039be6cb4dc9f9
author Mark Salyzyn <salyzyn@google.com> 1397253919 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397253919 +0000

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

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