OSDN Git Service

Merge "Workaround for input ANR, always finish PiP menu activity." into oc-dev
authorWinson Chung <winsonc@google.com>
Wed, 5 Apr 2017 23:44:50 +0000 (23:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Apr 2017 23:44:50 +0000 (23:44 +0000)
am: c9fa6399f2

Change-Id: I387739e284275fe8a857a567c596175a81deaad8


Trivial merge