diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-21 09:03:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-21 09:03:14 +0000 |
| commit | 96b7e1455a933e844820585b5dc35c6e48ffa8bd (patch) | |
| tree | c5591c8585bb5401e40c6b35a7896599ebd6bd7d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ce2d56cb0922d1292a6b2ad57a98436fccc44e60 (diff) | |
| parent | 760e54d75d6835f1aa2eba7c8755c098dae63777 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8db9af6fb5 -s ours am: 6c794475b2 -s ours am: 54bc37353f -s ours am: 760e54d75d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11937069
Change-Id: I2e0c933be468052fedb89d3d60a085ca84fb3dc5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions