tree a4de2a1c0f4e23016767d6d982253f374bd07975
parent fe963bfd8cf3a240785892f8194debb4e0ebb92d
parent 66f0d93c265657e17c7a1ddd74beb61070a8df69
author Narayan Kamath <narayan@google.com> 1413927778 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413927778 +0000

am 66f0d93c: Don\'t allow SUPPORTED_ABIs to be set by the native bridge.

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