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:01:48 +0000 (04:01 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 26 Jul 2017 04:01:48 +0000 (04:01 +0000)

Trivial merge