diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-21 18:32:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-21 18:32:22 +0000 |
| commit | db8be6ab527eb6e32ebe5498095fc3a7ad21a822 (patch) | |
| tree | c5591c8585bb5401e40c6b35a7896599ebd6bd7d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1c2a52d161dbe81292167db756afea2197cda202 (diff) | |
| parent | 1ac45864620dd7b1587839d869ad435c74e7aee7 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 3b1822849c -s ours am: 20790f8bef -s ours am: 094490eb51 -s ours am: 1ac4586462 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11937075
Change-Id: I8dd8b1076ea188ce7b3c9b09f2841acec0edc460
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions