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