tree e22de5165de2d876ad33f8912ce53e509235b8bb
parent 01dbfbf9c3e14253b7c3a2e822c55c013d0e4b17
parent 77aa51e5b7261638590af1d69ac03f4c8cd25692
author Amith Yamasani <yamasani@google.com> 1380305437 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380305437 -0700

am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra

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