tree fbfba66e46e8eb41ed5f18eee646b5cd72dd4583
parent f1f1b0a01324bcb5fc894b8482dec75cce8ff7c5
parent 771223db7e4c150328436b0e12ac965021944ba2
author Xin Li <delphij@google.com> 1567971765 -0700
committer Xin Li <delphij@google.com> 1567971765 -0700

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

No content change.

Bug: 135460123
Change-Id: I6bbad1fb8e66cc2c7a53db7e580799833f2a7bcd
Merged-In: I67e45067cbd831b3a64e6a41b3553de9cbcbc192