diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-15 19:01:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-15 19:01:33 +0000 |
| commit | 96119f51810078c565741e045adcf6b48f629938 (patch) | |
| tree | dd6ee66d7513de32f64438c314facb9f21b4bf5a /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | c60d4f785013e0f052d3dffec33272a87f573d85 (diff) | |
| parent | 6ab2a5b10d51ae016bc8064d812a7d82d7b8c5d1 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 56018c905c -s ours am: e3a0005da9 -s ours am: 6ab2a5b10d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12384598
Change-Id: I69af541192a8988f79116315d09b6708d8124455
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions