diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-15 17:36:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-15 17:36:21 +0000 |
| commit | b28a0975e8fdeb3ac43daef2c9f341be830c6242 (patch) | |
| tree | e72e859606df4d9e31b25140675c784b7caf0801 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 2eae64431647fcd58c24c98d6dc2d38671c85cd2 (diff) | |
| parent | c4734b7c36f8df9527de3c60a365569513a9cc2c (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 218b61acf4 -s ours am: ba382230d9 -s ours am: 4d745b86a7 -s ours am: c4734b7c36 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12156601
Change-Id: Id0a443772a747f9e04340d0189521813df576641
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions