diff options
author | Bill Yi <byi@google.com> | 2020-06-06 14:31:34 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-06 14:31:34 +0000 |
commit | e770ea9379c80c249a24c48d0bbd01a06b85df0d (patch) | |
tree | b3963b616eb3781c5f8bd4f1cfced083132a3f44 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 5590d904ad9108ba6c0c2c75111e412d18e9f3f7 (diff) | |
parent | ee70eff81bc9b2e83c57b111fea72ee19dbc8e8f (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 570c6a4e40 -s ours am: 8814b04124 -s ours am: ee70eff81b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11753726
Change-Id: If26c3d6c9d9ff419efbdeeed4400f539a2cf62c0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions