commit | 315c0015b7881bb1808c9dd55c10191132687828 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Sep 11 17:14:04 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Sep 11 17:14:04 2019 -0700 |
tree | 47e4872a8baef933909628a8856d85508e187f71 | |
parent | 5371c022fb658013a8c15fe9ace41a352e7d46f6 [diff] | |
parent | bbdff6f51987feea739e7b8dc487075858d4872b [diff] |
[automerger skipped] Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master am: 6a5fab707b -s ours am: 9a2f1dc9ea -s ours am: bbdff6f519 -s ours am skip reason: change_id Ied9a812f235e2a5146381b0ac8c602db1c6035f5 with SHA1 b9a4f9efdd is in history Change-Id: I9ef3e843cf24da30cfe09edce9ef390372f8407b