tree 5edb33013bdf57e97888ab974aaccf51c71ddea1
parent f31b3fdcaad8fea7db5b81054f24ff1bdbba6523
parent 94cc108048fb2b28fa64f1ba04a830877be88b65
author Benedict Wong <benedictwong@google.com> 1559901031 -0700
committer android-build-merger <android-build-merger@google.com> 1559901031 -0700

Merge changes from topic "am-9a435ce648dc47d49fc32dc2680fa5b7" into qt-r1-dev-plus-aosp
am: 94cc108048

Change-Id: I46aebe74e24d39b7fce0c7eb835e282d59f2c169