diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-22 19:38:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-22 19:38:51 +0000 |
| commit | a3ccedb3fc3d59434d93b22f88e9a1886d5789fc (patch) | |
| tree | 87611a13927dbbd03ed3a6efe9f44700c433b172 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 0d7dda110f14a053d9b65200662c6b65a3f769d2 (diff) | |
| parent | 1689cdd1cb00f96b373401fa9132fa4a58bd5883 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0033ce1b28 -s ours am: 1689cdd1cb -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684929
Change-Id: If7bec524c6ce6e3c0500e1e3750ed5372a28a9fe
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions