tree 310442d464502c421836a4ef3697f1ede7b646f4
parent c9b7938917ab330a9b5be036c94b644432402c51
parent 80cf46d6fb0248d62996e8277c1b699379e68e04
author Michael Gonzalez <michgonz@codeaurora.org> 1574113594 -0800
committer android-build-merger <android-build-merger@google.com> 1574113594 -0800

Merge changes Iba1c82b0,Ia498f6dd,I16fd11f5 into qt-qpr1-dev am: 40f8906f45
am: 80cf46d6fb

Change-Id: I05b66f64f0f941cde473d02d02e6c1714d7d4a6a