tree b4637f442207b54ebf829030623ec6765cb4bc42
parent 0c8a8a0f5c0bd7efbbba55d01d316a94dc530625
parent 365ebdb0e668435fd92f8fc5776cc960e3aeda1f
author Govinda Wasserman <gwasserman@google.com> 1561757433 -0700
committer android-build-merger <android-build-merger@google.com> 1561757433 -0700

[automerger skipped] Merge "[DO NOT MERGE] resolve merge conflicts of 079d81a4799a75e03a19148ed287e491142dd4c7 to qt-r1-dev" into qt-r1-dev am: c982441edb
am: 365ebdb0e6 -s ours
am skip reason: subject contains skip directive

Change-Id: I9e0e3455bdff0d2f0f3252b3d961963f13cb7219