summaryrefslogtreecommitdiffstats
path: root/keystore
diff options
context:
space:
mode:
authorXiaohui Chen <xiaohuic@google.com>2015-06-03 16:35:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-03 16:35:09 +0000
commit4913211dbe9f6dbbab75788976465eb2e4c46cd7 (patch)
treec52253d5a7f71eea09f7e72222d15562b0312c87 /keystore
parentac2e3886e3f129b0ee94bb514e026fe72951b4a8 (diff)
parentffcfe3411ff6ccaa35c2873151e31c879506dadd (diff)
downloadframeworks_base-4913211dbe9f6dbbab75788976465eb2e4c46cd7.zip
frameworks_base-4913211dbe9f6dbbab75788976465eb2e4c46cd7.tar.gz
frameworks_base-4913211dbe9f6dbbab75788976465eb2e4c46cd7.tar.bz2
Merge "usb debugging: show alert to secondary user" into mnc-dev
Diffstat (limited to 'keystore')
0 files changed, 0 insertions, 0 deletions