| commit | 286d28d614304efb7e4ad79429216a66c74925a5 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 17 03:37:33 2019 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 17 03:37:33 2019 +0000 |
| tree | 576b92a170673f534e72e1818a7dcf7d38e776c8 | |
| parent | c776a2e5c6bb36ea4929b34784bbdada4653d098 [diff] | |
| parent | 7303d534e9d21f1f12f0354b0d60b60a234db59e [diff] |
resolve merge conflicts of a23a319576fbf9389f6a0e159d321f9529d02bae to qt-qpr1-dev-plus-aosp am: 7303d534e9 Change-Id: I9e6846c8c6394eda6dabe0b46be07cb5e955325c