OSDN Git Service

Merge "Handle showWhenLocked on secondary displays" into oc-mr1-dev
authorDavid Stevens <stevensd@google.com>
Wed, 20 Sep 2017 00:18:26 +0000 (00:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Sep 2017 00:18:26 +0000 (00:18 +0000)
am: 9282193c84

Change-Id: Idbd4d3f24dffaad11518dd3d4d16ca7c7137ee94

1  2 
services/core/java/com/android/server/am/ActivityManagerService.java