diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-02 19:40:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-02 19:40:16 +0000 |
| commit | 26a58d39ec56b9a85d63c40b1690e71f7d6275b7 (patch) | |
| tree | f2d6c4077bc35ce34b940c85a135bb312bf07d67 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d8f8dbfd69d17804f0938ac07d3c6bb21fd74b1a (diff) | |
| parent | c10ee328afcd9ae4379b270ba111ea1b91701efc (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 2b8767c457 -s ours am: c10ee328af -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513831
Change-Id: I2ff62b467b989f634330a458ee48915b4f5bea86
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions