OSDN Git Service

Merge "Work on issue #74404949: Screen state usage API" into pi-dev
authorDianne Hackborn <hackbod@google.com>
Tue, 3 Apr 2018 00:52:06 +0000 (17:52 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 3 Apr 2018 00:52:06 +0000 (17:52 -0700)
am: 886fc6aef0

Change-Id: Ia612052dee8b7729900ab091ecae7db073f8d9fd

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

diff --cc api/current.txt
Simple merge