commit | 7fb48a776df4dbf97b6c83f085b36aa0e971da24 | [log] [tgz] |
---|---|---|
author | Winson Chung <winsonc@google.com> | Wed Jul 26 04:09:03 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jul 26 04:09:03 2017 +0000 |
tree | b3723f2665543013b7d9aee49751b517cf6a499d | |
parent | c7886489eea5b2667f470ae0cd3295942fa70896 [diff] | |
parent | e31847642c3bf4ed0f5947ac52b09d55c694561e [diff] |
Merge "Ensure that we timeout waiting when starting the PiP menu activity" into oc-dr1-dev am: e31847642c Change-Id: I0f0737b4407b9af27bf2012643786c718832d273