diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-10-05 15:08:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-05 15:08:06 +0000 |
| commit | b5d5d0d99c43e123e496c7546e9566d8e24599a4 (patch) | |
| tree | 6131e1f8debab82b8594819d9cc7d4b238415633 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 18cf87b9f3f97cb8de8f36b18c9e0f7f577774eb (diff) | |
| parent | 126049588f4f43ae39d996de269a3bc6b089cff4 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: ea299cb860 -s ours am: 126049588f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12762766
Change-Id: I8436af7cec8e8f76d105ea640a2ef84fd8852c4e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions