diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 09:26:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 09:26:00 +0000 |
| commit | c903018717653b8e26ea8d94018db410529af18f (patch) | |
| tree | a73c3b5e96002b0c1f1efb28186700f557c6a78a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 428aa91343b93004753c20bae6f7663fd7c99e44 (diff) | |
| parent | 8037d5af54a58a6d1ed3397386089e5f5c176efc (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 65997ef7b3 -s ours am: 3d121d3920 -s ours am: f610cd79bd -s ours am: f3f6295c7f -s ours am: 8037d5af54 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12079859
Change-Id: I4a4c79c9f17f1334f1f3cd2ba3b8406cef92e4bc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions