diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-21 18:30:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-21 18:30:33 +0000 |
| commit | f78de3608fd3a54c9366980440e0fbed20e0deef (patch) | |
| tree | c5591c8585bb5401e40c6b35a7896599ebd6bd7d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 9cb95dfde116850f05728eb4ac870e98aa571c5d (diff) | |
| parent | 4b75acd7deb17ca8ff35918c4599c116d9445acb (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 45b2fcf55d -s ours am: bd52820306 -s ours am: 8d62c50d89 -s ours am: 4b75acd7de -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11937072
Change-Id: I1f103de1bcd105c190dea6efdfe2248adf10e2c8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions