commit | d16ac8350b5da8cd92713d9cdfdc7415afec74c7 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Sep 11 17:15:52 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Sep 11 17:15:52 2019 -0700 |
tree | 5cc647ab86b362aa300ff35928fa2f3eace6df82 | |
parent | d0e32256002bb9724ddf4a1237624741809065e8 [diff] | |
parent | 8457a9034a9d13bb24f2c3e4b2fc871a00586eb0 [diff] |
[automerger skipped] Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master am: 5cfe24991e -s ours am: 372aaa1667 -s ours am: 8457a9034a -s ours am skip reason: change_id I8b74ae19788aaaca75ad44c465f7dc458117ccf1 with SHA1 4eb6999bbd is in history Change-Id: If159977fd962f3483f651739ae0b313f762b3f26