summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard/res/values-am
diff options
context:
space:
mode:
authorZoltan Szatmary-Ban <szatmz@google.com>2015-07-08 11:44:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-08 11:44:35 +0000
commita2de7fc9fc0b96ba4db65ccf6c9684c8c27c2993 (patch)
tree8987229173aa3adfff8024d58f0a97e63c985814 /packages/Keyguard/res/values-am
parent895927603606e58a46ecaee8f2244e1e2b6f2840 (diff)
parentb2eb6b9049567c134d7654f6cd79b4a47de643af (diff)
downloadframeworks_base-a2de7fc9fc0b96ba4db65ccf6c9684c8c27c2993.zip
frameworks_base-a2de7fc9fc0b96ba4db65ccf6c9684c8c27c2993.tar.gz
frameworks_base-a2de7fc9fc0b96ba4db65ccf6c9684c8c27c2993.tar.bz2
Merge "Prevent accidental unlocking of USB data transfer." into mnc-dev
Diffstat (limited to 'packages/Keyguard/res/values-am')
0 files changed, 0 insertions, 0 deletions