diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-15 17:35:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-15 17:35:45 +0000 |
| commit | 8ae91838f0bd4df63ae8a4a2fdcb333d5137cc4c (patch) | |
| tree | e72e859606df4d9e31b25140675c784b7caf0801 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 34b7897aeeb5b18a3308ad6727bde24f6feaf56d (diff) | |
| parent | 7762dcfa2a136ec7ec6fc42f41388983b70a2b0c (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 218b61acf4 -s ours am: 7b142fb0e4 -s ours am: 4c4973248f -s ours am: 7762dcfa2a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12156601
Change-Id: Ib4d42b42467aa4d66095e783f97a5cf6366703fd
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions