summaryrefslogtreecommitdiffstats
path: root/keystore
diff options
context:
space:
mode:
authorRubin Xu <rubinxu@google.com>2015-06-22 15:44:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-22 15:44:51 +0000
commitc54bcade1b7ec7e044aca7fe9c60357ad957a8c2 (patch)
treed5878f592ca2c0b221b386d2ac90541ba584f80f /keystore
parentb2aea9dcbd6edfa645c6fc3ae4adab95aa79cc1c (diff)
parent1213487aa7dc32d392cb5f2489f0c76321f02430 (diff)
downloadframeworks_base-c54bcade1b7ec7e044aca7fe9c60357ad957a8c2.zip
frameworks_base-c54bcade1b7ec7e044aca7fe9c60357ad957a8c2.tar.gz
frameworks_base-c54bcade1b7ec7e044aca7fe9c60357ad957a8c2.tar.bz2
Merge "New internal permission to protect apps against rogue Nfc message." into mnc-dev
Diffstat (limited to 'keystore')
0 files changed, 0 insertions, 0 deletions