diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-21 18:31:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-21 18:31:55 +0000 |
| commit | 12653eafb41a5faeb08f225326cbd3c7ec5a9d9f (patch) | |
| tree | c5591c8585bb5401e40c6b35a7896599ebd6bd7d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f659ee96e66b616b642e01bb5405c36a59ea7378 (diff) | |
| parent | 49a6a40798dd1e769db9f47fd8a2a747f1419c47 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 45b2fcf55d -s ours am: 101de7aae1 -s ours am: 97900e4862 -s ours am: 49a6a40798 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11937072
Change-Id: Ib39d7e26b2aafe20e590300134a8fb7e620d7624
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions