diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-15 17:11:00 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-15 17:11:00 +0000 |
commit | c4734b7c36f8df9527de3c60a365569513a9cc2c (patch) | |
tree | 4c78b275630199841534948ff64a16a45ab61209 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 819d6f29ece836c13ee8772051d1e1325e659e3a (diff) | |
parent | 4d745b86a77a2fae54d9245c3a123489deca3fa4 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12156601
Change-Id: I32273c7e224c483548f7aeb5546d6761ac345d48
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions