diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-05 22:17:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-05 22:17:24 +0000 |
| commit | fd71ecbfe1b71522f428de89e9e29d44878baeeb (patch) | |
| tree | e1fd5c9113c23e3dfe3dd13a402374634a65a958 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b2b315a26e3f272c34e1cc0f33b71375ddff49ef (diff) | |
| parent | 719c1e9be180999c95cb234adc7e81bea4fae463 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 7d83422578 -s ours am: 719c1e9be1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13171311
Change-Id: I3143fef718965322732cd3565cb2901bd08f7ce2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions