diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-06 16:38:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-06 16:38:22 +0000 |
| commit | f1bde7bba3ab2be28b548aa003704f2a9c053d85 (patch) | |
| tree | 7652ac3d66acf9b55fe6815121dd2219e2c8716a /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | e78ff11f752c06718286a30c3e0adec806d6489e (diff) | |
| parent | c092104a5d68730755002cdbff534335ff2ea4b0 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 21cdf6fe8d -s ours am: c092104a5d -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519351
Change-Id: I4593c6a74d7075a1a263d84bc84d3750f0cb568a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions