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