OSDN Git Service

Merge "Fixing some issues with the assistant stack" into oc-dr1-dev
authorWinson Chung <winsonc@google.com>
Wed, 12 Jul 2017 22:41:22 +0000 (22:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Jul 2017 22:41:22 +0000 (22:41 +0000)
am: fbb85140f8

Change-Id: Iaf515fe72bd89ce4cf903ebb6d1c631353482c95


Trivial merge