tree c37607eed0174e7259a511f99468da50e4031cd4
parent 5d21820a979cac6d9a7426b5a5aed4b65e3cc67b
parent 451d8225ef3ae407f52512a93bcf04e6400eb997
author Amith Yamasani <yamasani@google.com> 1380306467 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380306467 -0700

am 451d8225: am 49187c94: am 53a56ad8: am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra

* commit '451d8225ef3ae407f52512a93bcf04e6400eb997':
  Make sure that external callers cannot pass in the confirm bypass extra