tree 235dfc96725bb8175ec1f25ddc70cead6be68c10
parent 4de4e6defce30e7693cea04e9553ee3bb1e72f88
parent 8cf2ce1064847d5fed0ec728ef6e916e238767c0
author Narayan Kamath <narayan@google.com> 1414524510 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414524510 +0000

am 8cf2ce10: Merge "Don\'t allow SUPPORTED_ABIs to be set by the native bridge."

* commit '8cf2ce1064847d5fed0ec728ef6e916e238767c0':
  Don't allow SUPPORTED_ABIs to be set by the native bridge.