commit | 2ac289a328319de9765133c531d816460b426df3 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Sep 11 15:48:52 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Sep 11 15:48:52 2019 -0700 |
tree | e274c55358f1639a00ed65526b2a117f367af6bf | |
parent | aaa6d242162613f664fd101bd14c415c87737797 [diff] | |
parent | 8a1338d9632d47f21f4f3cd2a73b8c4a1c988d79 [diff] |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 639116d20f -s ours am: 74c2c255b4 -s ours am: 8a1338d963 -s ours am skip reason: change_id I0f9ac646b953d8831f47f28b2f20df90d9b028d9 with SHA1 209f1362de is in history Change-Id: I4edf69c3fded7aa7bdd0e6a66d5c0212367ebba8