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)
commit85cac19a66ecb75d5ba5c8cc7c381fb9c71cb071
treed62b4df5799d2c170be1019f31e6c31b83adb715
parentdbb33c058b13cca8b4ba916bac9a4bd08d0ddcc4
parent9282193c8408f392e7a3b9660390afa2194f023b
Merge "Handle showWhenLocked on secondary displays" into oc-mr1-dev
am: 9282193c84

Change-Id: Idbd4d3f24dffaad11518dd3d4d16ca7c7137ee94
services/core/java/com/android/server/am/ActivityManagerService.java