diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 17:52:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 17:52:45 +0000 |
| commit | 4c280b8d31f25a955660644a2cab7971a1ada92f (patch) | |
| tree | cade9d6f17d984a1d175b8c1e74e2a13f8aa2df7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | aa63d8df26ca11dd8707162025136949e29a2c5e (diff) | |
| parent | ce237e39deda8e0e26b4660d1524d2c6a7306ee7 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: c83b93b3f1 -s ours am: 75c3356103 -s ours am: 22810521eb -s ours am: 81d4133de9 -s ours" into rvc-qpr-dev-plus-aosp am: ce237e39de -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12087182
Change-Id: I085d9ff32c732621cf6b2c2384698d2da01c5dc6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions