OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b4f27c9 23fd13d)
am 23fd13de: am f10d0399: Made secure-adb\'s new-public-key activity configurable...
authorAaron Whyte <awhyte@google.com>
Fri, 28 Mar 2014 23:40:13 +0000 (23:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Mar 2014 23:40:13 +0000 (23:40 +0000)
* commit '23fd13de62762e98c32f2b7525f01f0bcdf416fd':
  Made secure-adb's new-public-key activity configurable. Some devices do not have lockscreens themselves, so the plan is to have them do RPCs to companion devices that can have lockscreens, for allowing or rejecting unwhitelisted adb public keys.

1  2 
core/res/res/values/config.xml patch | diff1 | diff2 | blob | history
core/res/res/values/symbols.xml patch | diff1 | diff2 | blob | history

diff --cc core/res/res/values/config.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
frameworks/base
About OSDN
Find Software
Develop Software
Help