tree 39424b3e1a14e3724fb28c5cfadaa79a183c6d9b
parent c492450147503a1ab6a26b5a8d372f7b1db78a82
parent 711b5584db13b6a2aca555e577c3d7cfb04946ab
author Dmitriy Ivanov <dimitry@google.com> 1404256354 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404256354 +0000

am 711b5584: am 105ef36c: Merge "Native tests are now multilib=both by default"

* commit '711b5584db13b6a2aca555e577c3d7cfb04946ab':
  Native tests are now multilib=both by default