commit | ca1401075ce8822cc518429da8f532a1134e52ae | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Sep 11 14:52:04 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Sep 11 14:52:04 2019 -0700 |
tree | 378cb683e04ef41306432793332e52df1b232fe3 | |
parent | 8c06c1cb412136651a66200a24b963adb90a16a3 [diff] | |
parent | 2697cb46593ee8c778ba8267ad3e3f12432e8aba [diff] |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 15be13ea71 -s ours am: 2697cb4659 -s ours am skip reason: change_id Ibbd540dbb5baee46360d3fe9469212cfd8f550ba with SHA1 f7b2330d86 is in history Change-Id: Ie4e5e96b6d9e6c74b941afe82d8ae28557c534a9