diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 14:00:48 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 14:00:48 +0000 |
commit | 32bcd973255e501afe78a380f964b08cc3e2a030 (patch) | |
tree | c43b959ebcbe451da1190f98d4d90e0d35e58932 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 40c724bf29553d8f5b5bbb2deec0ba2123bb4d98 (diff) | |
parent | 730089156fa9bf249ff79c3a2423ea625ad3a223 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 730089156f -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420418
Change-Id: I73607ddca82d1f6a7bc8023e7d3fe278d46bcc5f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions