diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 00:06:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 00:06:01 +0000 |
| commit | d2252bc5c3fa3334841ef4a08d2171b8ab5675e9 (patch) | |
| tree | c9e5cc728e671a5de21b72d7c756453b05db63ef /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 4676897a5dbce3c916bee4c0fd351f3183e39e22 (diff) | |
| parent | 404bc1e6f6fb594134664d6ef88797b2c6f11e3f (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: eb3dd3dcc5 -s ours am: 8e0aa0a5f7 -s ours am: 404bc1e6f6 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419995
Change-Id: I80114575f420d45ad9bbc0ebed9bd8b4ed008cd5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions