tree eba6f8ba2a2c5553f5ffd555871e5b2938fbb75c
parent 3d678ad462ee237d86efd9d985eb518817761e05
parent 4980996bcc4e8065cf5dff1cf989d73face38281
author Aaron Whyte <awhyte@google.com> 1397692160 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397692160 +0000

am 4980996b: Merge "Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity." into klp-modular-dev

* commit '4980996bcc4e8065cf5dff1cf989d73face38281':
  Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity.