tree 33f05fcb02b39ce15aa202ac28ce3cbf9b405736
parent 42446b57247e20b9a3e7071cdb188655df9a3d7e
parent cd320a6b52937a920cfb29a98153531bd6d746fd
author Xin Li <delphij@google.com> 1567985334 -0700
committer android-build-merger <android-build-merger@google.com> 1567985334 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: c111d2d319 -s ours am: 330107719b -s ours
am: cd320a6b52 -s ours
am skip reason: change_id I231c58c0cdb60b8e7dcf9c017d247ee6f9f01c75 with SHA1 500c6a6bdb is in history

Change-Id: I4f75bc133322c2ada81e0e6a231903f2d5dd7d7f