diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-05 22:14:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-05 22:14:48 +0000 |
| commit | 387c6294ce43a158d3bcc336ed139f1e43b45c84 (patch) | |
| tree | d3aae18ea1e1092585182efd404fb86d0cbda374 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4220fb0423d9df19ab452027147a81fa5754d435 (diff) | |
| parent | 0aba5b1061d8b5c202ff6fa19efb05143d0ecfeb (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b4c94b4110 -s ours am: 0aba5b1061 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13169560
Change-Id: I8b75a7730bd0339bc456eb8753ee863f08ca1dc8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions