diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 18:35:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-03 18:35:15 +0000 |
| commit | 65b5eb12d5ecceb416c0852dc20d7043db750df9 (patch) | |
| tree | b0da6fd27c8e0c3b63c5f7bb7f8b1ec96dd344c0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4ea77cc0f11641a68af9520cfc7f452ad96f0a10 (diff) | |
| parent | 17416bcf80a256c005938a01b31b3057aa72e561 (diff) | |
Merge changes from topic "am-35a2a7dc166049afa7b7683d9a6ad486" into rvc-dev
* changes:
[automerger skipped] Merge "DO NOT MERGE Prevent ImageWallpaper from crashing due to wide gamut" into qt-dev am: 04ee91a8a5 am: dd974dc848 -s ours
[automerger skipped] DO NOT MERGE Prevent ImageWallpaper from crashing due to wide gamut am: 34c8ecdf28 am: 8ce7251110 -s ours
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions