OSDN Git Service

Merge "Show x for short period of time when activity is PIP'd" into oc-dev am: 56069d7146
authorMady Mellor <madym@google.com>
Wed, 12 Apr 2017 15:43:26 +0000 (15:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Apr 2017 15:43:26 +0000 (15:43 +0000)
am: f0caa83702

Change-Id: I90144f8bf5d7d030aed106116b2e231a62c29bd5


Trivial merge