tree a50470194881ea06edd49d4b1ea6f73d0ffa2f6b
parent d6bd615920199460533b6666ae812110a7845652
parent bd698b99cae52f1b326fb2bc167d5dfd4d47573e
author Kevin Chyn <kchyn@google.com> 1562909152 -0700
committer android-build-merger <android-build-merger@google.com> 1562909152 -0700

Merge changes Ia3307593,I43126ce1 into qt-r1-dev
am: bd698b99ca

Change-Id: I142a3f6b46dd832c5dbb864c6f3faa47ef99e4c1