| commit | edb8d878a141923a7b96e1020e7521788c03a3ed | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Sep 11 14:47:37 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Sep 11 14:47:37 2019 -0700 |
| tree | 31600a2c7fb58693406f38e53c55a7530d3b8dde | |
| parent | ed65281a53342688c0404edb5ad8874d2b8c5c29 [diff] | |
| parent | b584b2a66cafa00df5a9f5620ffdd03c45ffbbf5 [diff] |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 99bc15c4d5 -s ours am: b584b2a66c -s ours am skip reason: change_id Icfe61f4ce95a4299bb6056069fc5b8ce96ec62b8 with SHA1 5b2bb6743e is in history Change-Id: Ic99d2d35a5d41d892632b91295dd36f13351e481