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