diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-22 20:01:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-22 20:01:19 +0000 |
| commit | 7cef22868631d9797e6901c4ca26a0c51196c5d1 (patch) | |
| tree | 87611a13927dbbd03ed3a6efe9f44700c433b172 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | a3ccedb3fc3d59434d93b22f88e9a1886d5789fc (diff) | |
| parent | ff696632458e47b6b49e2695324b635930a7c605 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ba3a4a3680 -s ours am: ff69663245 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684629
Change-Id: I6bf6a845125d1d3eb9f2cf927f004cd7ed2944c4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions