summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard/res/values/strings.xml
diff options
context:
space:
mode:
authorRobin Lee <rgl@google.com>2015-07-10 19:21:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-10 19:21:44 +0000
commit2164cf4f4043b4892db5688ed53624af758fcdaa (patch)
tree0a2140c5784447cbebedc4ec3435f14a4f54b2a9 /packages/Keyguard/res/values/strings.xml
parent9320bb082f53dfdf34881907a736527b3bdd9b45 (diff)
parentf180fe31de4cc428c298a2faed394c417ade5483 (diff)
downloadframeworks_base-2164cf4f4043b4892db5688ed53624af758fcdaa.zip
frameworks_base-2164cf4f4043b4892db5688ed53624af758fcdaa.tar.gz
frameworks_base-2164cf4f4043b4892db5688ed53624af758fcdaa.tar.bz2
am f180fe31: Merge "Legacy VPN calls to require a userID" into mnc-dev
* commit 'f180fe31de4cc428c298a2faed394c417ade5483': Legacy VPN calls to require a userID
Diffstat (limited to 'packages/Keyguard/res/values/strings.xml')
0 files changed, 0 insertions, 0 deletions