tree e1f20a8eb326b820fd0749ce70dfde2b19b85dd5
parent 9bbf5ee2f03642fdb7e8b660a3f75300938a842e
parent 95bf75d971c4b0f046c13be2522541a200537a2b
author Kevin Rocard <krocard@google.com> 1502826110 +0000
committer android-build-merger <android-build-merger@google.com> 1502826110 +0000

Merge "Merge "Put usb stream into standby on disconnection if offloading" into oc-dr1-dev am: 8f3ad15ee5 am: a226338f43" into oc-mr1-dev-plus-aosp
am: 95bf75d971

Change-Id: I559e3f5a972e3ab8cd1838916482bd933a9c079e