| commit | ee5d512d624c15fa0c7e179ace24c7055a9f539d | [log] [tgz] |
|---|---|---|
| author | Aaron Whyte <awhyte@google.com> | Wed Apr 16 23:49:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 16 23:49:20 2014 +0000 |
| tree | eba6f8ba2a2c5553f5ffd555871e5b2938fbb75c | |
| parent | 3d678ad462ee237d86efd9d985eb518817761e05 [diff] | |
| parent | 4980996bcc4e8065cf5dff1cf989d73face38281 [diff] |
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.