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