diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-23 19:09:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-23 19:09:38 +0000 |
| commit | 4dd2a45236cfd77543380924e6cc9f79c7554b4f (patch) | |
| tree | 45bd5040eaca7ae3b32abc23ad018e6a7155baee /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 93f51ae5da34b1808017e040a0a5e2cb51601018 (diff) | |
| parent | 540ff060c8f624a2d7734abad0146127b880c111 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1360305231 -s ours am: 540ff060c8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12431379
Change-Id: Ib05ba90542f389bffa4cf5e5fe9f0c6961357e95
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions