diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-18 23:16:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-18 23:16:23 +0000 |
| commit | 5c5440a0ea66c9eb604a08839d2223633a50fa2d (patch) | |
| tree | fa5d13dde773516ee037884b269cf25a1c31cb7c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f446c04ffdd547c6b84ba6663c9a31aa73494d70 (diff) | |
| parent | 5b04790e1698431effd9611d598ed46e54256d59 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 0f05db89c3 -s ours am: 5b04790e16 -s ours
am skip reason: subject contains skip directive
Change-Id: Iaf3b4aa0ec320e577985fad58835e29a9219711b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions