diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-21 18:30:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-21 18:30:59 +0000 |
| commit | 91b5c15c4ded6dd18c2551590f18fa61e0f681c3 (patch) | |
| tree | c5591c8585bb5401e40c6b35a7896599ebd6bd7d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f78de3608fd3a54c9366980440e0fbed20e0deef (diff) | |
| parent | 36ff9c9d7a631cc7d2e19a2da1a5f69c38350145 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 38991cd74f -s ours am: a5b5196ca2 -s ours am: 593fea3e90 -s ours am: 36ff9c9d7a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11937073
Change-Id: Ia8cbe6847824431e84e21482b7998d78c08f74ab
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions