diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-05 21:44:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-05 21:44:16 +0000 |
| commit | 81c71ad50c28239f2663d9351e69a176862c9d7a (patch) | |
| tree | 49036e1132f5a005f74cc468aee9b83ad90ba435 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6f326f4318f176e8f41821037ad4666fed33d206 (diff) | |
| parent | ab2defbe0aa649506550d62bb442f66255dbf56e (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 97455bb190 -s ours am: f8c9fc05fc -s ours am: eec3cdbd5c -s ours am: b4fd8a3249 -s ours am: ab2defbe0a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12077356
Change-Id: I4b5a9e6cdedb6aabb82dd1b24eec3a42c10f72f1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions