diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-21 18:32:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-21 18:32:50 +0000 |
| commit | fdf63fd353c3d9ebe83b3901386ad22f2b9de8a7 (patch) | |
| tree | c5591c8585bb5401e40c6b35a7896599ebd6bd7d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | fac39ddde4ba51c94518834e6fbe92362fe71f13 (diff) | |
| parent | 981c5f86c564bc986f1aaf6ac42caf6a6d93b8f5 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 5b962929bf -s ours am: f2e45704c6 -s ours am: b76f4bc35a -s ours am: 981c5f86c5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11937074
Change-Id: I84a6c111a94a6c8547690fa0ec02b8ae516922c1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions