OSDN Git Service

Merge "Ensure that we timeout waiting when starting the PiP menu activity" into oc...
authorWinson Chung <winsonc@google.com>
Wed, 26 Jul 2017 04:09:05 +0000 (04:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 04:09:05 +0000 (04:09 +0000)
am: e31847642c

Change-Id: Ida93e02bae4e099ae20d2db7bd0d3efb774a546c


Trivial merge