diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-13 04:51:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-13 04:51:46 +0000 |
| commit | 4bb8d3def49baa5ae73e9d5159b9c3447f44a729 (patch) | |
| tree | a3cba0a323d57fe3e658f26759a650de8cb881f1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c15b706790f421ad716fec2d0bb7e3cb13f170c0 (diff) | |
| parent | ad1a19c3dfd32cb4ba79d180b0f3e9f9d55a4f8c (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f45da6fd42 -s ours am: ad1a19c3df -s ours
am skip reason: subject contains skip directive
Change-Id: Ifcb85b2cdeaea3c12dbb63647a6ac493246a1afb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions