tree 2665c8d8acf7455978b53d990f455a615d6d4631
parent 3aac18932b3d197ec5e10651f0252383ae39c1b3
parent fb2c21c43981204f256a5c3b01fab0f1813496dd
author Xin Li <delphij@google.com> 1567971910 -0700
committer Xin Li <delphij@google.com> 1567971910 -0700

Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master

No content change.

Bug: 135460123
Change-Id: I67771f4bc7a1fa5a448da1a1c9f7f28a8a4b72f5
Merged-In: I74e378c19586cb1d32088a8444f47595ad0ecdd7