tree 38fb22b5e764d044e41157f19c94e62f23566d54
parent af3465fc6ce43feb0bca145758c9d60d7c559079
parent d15578838d8366358ffc3a282ac41b4a5610c8ea
author Xin Li <delphij@google.com> 1567982889 -0700
committer android-build-merger <android-build-merger@google.com> 1567982889 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 74f7f81de0 -s ours
am: d15578838d -s ours
am skip reason: change_id Iee54a2d226deff786a190480b6ca1d6f7424992c with SHA1 091e3281db is in history

Change-Id: I5db02ac27c594624f0c2a3278cc911433912e182