diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 09:26:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 09:26:48 +0000 |
| commit | c92ea513f281992fd4bd80919d7ccd1b6d8f9434 (patch) | |
| tree | a73c3b5e96002b0c1f1efb28186700f557c6a78a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ea2172b63a20a104ba522207d43dd0e226486785 (diff) | |
| parent | 49d6cd84c46acace39157d2b5b45aaab86f457db (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 65997ef7b3 -s ours am: 3d121d3920 -s ours am: cf3a5fb7b7 -s ours am: f78aa70453 -s ours am: 49d6cd84c4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12079859
Change-Id: I9f44e5111f3ad8561a4603e0218684faaab1853c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions