diff options
author | Bill Yi <byi@google.com> | 2021-09-12 13:15:48 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-12 13:15:48 +0000 |
commit | 8ad9ec5296787d296b5880197e89ec5759e964f8 (patch) | |
tree | bad30ec36b56663f55f4c40419745aabb87bfad0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 1e62abbbf4f79a9ca68263f2e0f1ce095cca3393 (diff) | |
parent | e0b10728ba010a03e405f3f3d3f54f191ceee035 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: aaf9602410 -s ours am: e0b10728ba -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15810223
Change-Id: I8d647e81de8cc1f7f6bf0fda50734106ec5f6a1d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions