| commit | 7fd13f6a731b68cf470d590818ea52b8351c9e41 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 04 15:16:08 2019 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 04 15:16:08 2019 +0000 |
| tree | 2ddcc7893727d216b78cf7db18c1f95d25a31ecf | |
| parent | 3f92a5bea6485e2116faaf3011fc918911a44bdc [diff] | |
| parent | ce302dbd6ee594a95c832bf1531d880191ba4a42 [diff] |
[automerger skipped] Merge "DO NOT MERGE resolve merge conflicts of 872009a3bc9909b1804f092d9c1759487b68aea7 to qt-qpr1-dev-plus-aosp" into qt-qpr1-dev-plus-aosp am: ce302dbd6e -s ours am skip reason: subject contains skip directive Change-Id: I2be91541c35bdab23d47cb5fe897ec756c1525e4