| commit | 97e577120a349d49e28eeb8410a3293f0d2ed20b | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 19 22:32:40 2019 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 19 22:32:40 2019 +0000 |
| tree | 4589e1b86e973f5777f9f75ca66ca4050c87daf3 | |
| parent | 897ea7176c132b67ac8ddb884a64d51fa16338fa [diff] | |
| parent | 3dea4bc15062cdefd3ad515f2565ee3e8bca69b7 [diff] |
resolve merge conflicts of 568a55d2c3c53ef19117eac8a588108878d6b02e to qt-dev am: 3dea4bc150 Change-Id: Ia3f52a90c1221789efbcf27486d88427e7388e43