tree c827d9b0e4b759c7ff969c00f8257d3f3306c04e
parent 3d295988f2d7011db3cec69ba0d80736a568ab15
parent ee5d512d624c15fa0c7e179ace24c7055a9f539d
author Aaron Whyte <awhyte@google.com> 1397692567 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397692567 +0000

am ee5d512d: 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 'ee5d512d624c15fa0c7e179ace24c7055a9f539d':
  Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity.