diff options
| author | Andres Morales <anmorales@google.com> | 2014-11-20 18:19:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-20 18:19:19 +0000 |
| commit | 8a80bc7b9b873290a57b938eaa01a3156d0de861 (patch) | |
| tree | 461f99c0161f926c9c01f1f5ca771261dab1eb9d /res/values-hi/strings.xml | |
| parent | 14ca22641d7fa624eebdc68554bf2612f2682791 (diff) | |
| parent | 31b0f4653686119d74876cae5d637c5baf52b935 (diff) | |
| download | android_packages_apps_Nfc-8a80bc7b9b873290a57b938eaa01a3156d0de861.tar.gz android_packages_apps_Nfc-8a80bc7b9b873290a57b938eaa01a3156d0de861.tar.bz2 android_packages_apps_Nfc-8a80bc7b9b873290a57b938eaa01a3156d0de861.zip | |
Merge "Prevent Beam at the lockscreen and during provisioning" into lmp-mr1-dev
Diffstat (limited to 'res/values-hi/strings.xml')
0 files changed, 0 insertions, 0 deletions