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