diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 14:22:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:22:55 +0000 |
| commit | f543fb5832fb7114089fcb59ffd6c2df46e546c7 (patch) | |
| tree | 4dc1880b8fa57b28ce990067e0049c0f065dcc8c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ef111c415131372b3de81c506a780bdda0e77498 (diff) | |
| parent | b419dee7d62173e74ee5dad3fdf8523ace01f325 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8adc4f7f3f -s ours am: e9ae85a025 -s ours am: b419dee7d6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086570
Change-Id: Ia11ab2cb40a529b36f551ceb59536a1b4e134ab7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions