diff options
| author | Xin Li <delphij@google.com> | 2020-09-11 00:40:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-11 00:40:47 +0000 |
| commit | 641fefe471a741840b18d5e5326137a9e5b7bcaf (patch) | |
| tree | 9b0a5793526e53b10d60d8f8d577d36dac29ecd8 /res/values-ja/strings.xml | |
| parent | 9b46ee57e7e550b7b1b9f5541ce09d04fa511b0c (diff) | |
| parent | b3b7c4fca1b823815b5e072a1afd0be08d395c8c (diff) | |
| download | Nfc-641fefe471a741840b18d5e5326137a9e5b7bcaf.tar.gz | |
[automerger skipped] Merge "Merge Android R" am: b3b7c4fca1 -s ours
am skip reason: Change-Id I082590a654e58c251e067b34ed043f7335111b75 with SHA-1 9b46ee57e7 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1422473
Change-Id: I8726982e2850ef12ec101381250efa02901b3499
Diffstat (limited to 'res/values-ja/strings.xml')
0 files changed, 0 insertions, 0 deletions