diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-02 03:41:32 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-02 03:41:32 +0000 |
commit | 069590adbb5762df825e200b6a1bdd9e53ba5a8b (patch) | |
tree | 6f77117fd424ba1481fa6289e9086f88ff8ac6bb /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | f4930cfd3354adcb2b7183d44fa5ffb2f8285158 (diff) | |
parent | 2c556eee02291c4157642e155b180afb2a197cc4 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2c556eee02 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539161
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7141e607f2cbdfa89cc8c0bd2140f2e3d9deb47e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions