summaryrefslogtreecommitdiffstats
path: root/res/values-my-rMM
diff options
context:
space:
mode:
authorLucky Zhang <luckyzh@google.com>2014-12-03 00:32:01 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-03 00:32:01 +0000
commit97f70e72638b822f09e9ba23a70d31057147c6cd (patch)
tree6bf6c2e9b8d3061936463b4834930fac9c7e45be /res/values-my-rMM
parent1d0667a07b09771cca05f0d6f7d89c018ff88575 (diff)
parent23ab054dd94a639ca43e011b931eb12c5122c596 (diff)
downloadpackages_apps_Settings-97f70e72638b822f09e9ba23a70d31057147c6cd.zip
packages_apps_Settings-97f70e72638b822f09e9ba23a70d31057147c6cd.tar.gz
packages_apps_Settings-97f70e72638b822f09e9ba23a70d31057147c6cd.tar.bz2
am 23ab054d: am 955f412c: am 91177d1c: Merge "[FRP] Show FRP warning when disabling secure unlock" into lmp-mr1-dev
* commit '23ab054dd94a639ca43e011b931eb12c5122c596': [FRP] Show FRP warning when disabling secure unlock
Diffstat (limited to 'res/values-my-rMM')
0 files changed, 0 insertions, 0 deletions