diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 19:21:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-03 19:21:14 +0000 |
| commit | b1457bc5b0f5c498f4afbb400a3dbcd59eb6cf33 (patch) | |
| tree | 75a8f594d1851e840c4f58f3bf8c423cf39ef16a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 42b4d77830b7237a221be84236c3862a0e0450bb (diff) | |
| parent | 04a94d3d2c011d93967e1d796e486eb72844e583 (diff) | |
Merge changes from topic "am-e651a3e4a6e64bcfb67d9bb253ec63de" into rvc-qpr-dev-plus-aosp
* changes:
Merge changes from topic "am-35a2a7dc166049afa7b7683d9a6ad486" into rvc-dev am: 65b5eb12d5 am: 0a2b54225d am: 0f7e485f17
[automerger skipped] Merge "DO NOT MERGE Prevent ImageWallpaper from crashing due to wide gamut" into qt-dev am: 04ee91a8a5 am: dd974dc848 -s ours am: 17416bcf80 am: 016184b968 am: 805e649902
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions