tree b3723f2665543013b7d9aee49751b517cf6a499d
parent c7886489eea5b2667f470ae0cd3295942fa70896
parent e31847642c3bf4ed0f5947ac52b09d55c694561e
author Winson Chung <winsonc@google.com> 1501042143 +0000
committer android-build-merger <android-build-merger@google.com> 1501042143 +0000

Merge "Ensure that we timeout waiting when starting the PiP menu activity" into oc-dr1-dev
am: e31847642c

Change-Id: I0f0737b4407b9af27bf2012643786c718832d273