diff options
author | Bill Yi <byi@google.com> | 2021-08-23 20:06:39 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-23 20:06:39 +0000 |
commit | 4e4fd38210e9704b933a29d7858df8fb5342814b (patch) | |
tree | 2e599b83e319a59098101b52912b2391ad641c85 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | e8727cab650a69ce824ff5b9d74ff1c854be7a72 (diff) | |
parent | 35062e84268124cb603a9967c099ec6446b2ea64 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 09ce8952ec -s ours am: 35062e8426 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15640441
Change-Id: Ia19b51cba504bf839a9a1be1841c39eecf904d8b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions