diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2015-10-20 03:23:23 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-10-20 03:23:23 +0000 |
commit | 259df7f9f3a96f62646d398664369d179a1bd126 (patch) | |
tree | b636aff16cf48ef288ca24d2b94791b1e9093e73 /res/values-ja/strings.xml | |
parent | 4d5b139605cdb61b87b1c9425574ff57fe3f9e6f (diff) | |
parent | f931ee9417b9012b7a8a8818da12051d9c77dafb (diff) | |
download | android_packages_apps_Nfc-259df7f9f3a96f62646d398664369d179a1bd126.tar.gz android_packages_apps_Nfc-259df7f9f3a96f62646d398664369d179a1bd126.tar.bz2 android_packages_apps_Nfc-259df7f9f3a96f62646d398664369d179a1bd126.zip |
Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Nfc into klp-modular-dev am: e83149922a am: 19108b5825 am: 63280fe6e9 am: f96895a212 am: 740e072600 am: 7390f09a40 am: 755d0a2d63 am: 8d04aeed70
am: f931ee9417
* commit 'f931ee9417b9012b7a8a8818da12051d9c77dafb':
Diffstat (limited to 'res/values-ja/strings.xml')
0 files changed, 0 insertions, 0 deletions