OSDN Git Service

Merge "Fixes bad merge in Assistant Handle logic" into qt-dev
authorGovinda Wasserman <gwasserman@google.com>
Wed, 12 Jun 2019 00:23:35 +0000 (17:23 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Jun 2019 00:23:35 +0000 (17:23 -0700)
am: b349bcf5a5

Change-Id: Ie9eab942ea837e8ec9f6cea2a9ccd1718452ed23


Trivial merge