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