| commit | ffe59902cf60cedc99415c48536aaf2220897d43 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Feb 22 06:25:59 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Feb 22 06:25:59 2020 +0000 |
| tree | b68dc71ff57765374166a160f814a15ada668ee2 | |
| parent | 26df17875ade88416aa876c4deeb0ff922a389ad [diff] | |
| parent | b08fef7324e2ffc4eb85a716b367053a5cfbbf40 [diff] |
resolve merge conflicts of c178021c320a49a2690403d3fca3c213294b27a6 to qt-dev-plus-aosp am: cee3a8836c am: b08fef7324 Change-Id: I84d7ba7deaa5f586a444f8b443a3263f101c8a11