tree 3a8880894a39136ba708abb92a15654e36b6cc6c
parent 4f7346b4fa6d9c531b30cde05267ce4e8c45efda
parent 8d10791f5b979a5343f462d1b0e9ab1cbbfe8346
author Winson Chung <winsonc@google.com> 1499818175 +0000
committer android-build-merger <android-build-merger@google.com> 1499818175 +0000

Merge "Ensure transparent assistant works with PiP" into oc-dr1-dev
am: 8d10791f5b

Change-Id: Ie8ea7cec050551193b1c0520e349f6552fe0b6dd