summaryrefslogtreecommitdiffstats
path: root/res/values/strings.xml
diff options
context:
space:
mode:
authorAndres Morales <anmorales@google.com>2014-11-18 02:06:42 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-18 02:06:42 +0000
commit6421180bc88cf2aba492af0aa1ac3be920a068b3 (patch)
treefe7240154b73678d96975feb24acb3278b4009e4 /res/values/strings.xml
parent342ab89c2770fce7fa43693767f749072e6077ae (diff)
parentfea5ef6d40d8fe2340dec22955ccfdb244e3c0c9 (diff)
downloadandroid_packages_apps_Nfc-6421180bc88cf2aba492af0aa1ac3be920a068b3.tar.gz
android_packages_apps_Nfc-6421180bc88cf2aba492af0aa1ac3be920a068b3.tar.bz2
android_packages_apps_Nfc-6421180bc88cf2aba492af0aa1ac3be920a068b3.zip
am fea5ef6d: am 2ca2ced6: Merge "Refactor Beam to work with managed profiles" into lmp-mr1-dev
* commit 'fea5ef6d40d8fe2340dec22955ccfdb244e3c0c9': Refactor Beam to work with managed profiles
Diffstat (limited to 'res/values/strings.xml')
0 files changed, 0 insertions, 0 deletions