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)
commitb45bc522f65babbbf040cd6b8a7e0d73d954cb5a
tree4e9ffb6ed6aac1bdf38440f10c183803304964c6
parent9f4e4072e5692daa0e035192631f6c53599420ad
parent886fc6aef0a33d3f9ab7c30b019187609d71facd
Merge "Work on issue #74404949: Screen state usage API" into pi-dev
am: 886fc6aef0

Change-Id: Ia612052dee8b7729900ab091ecae7db073f8d9fd
api/current.txt
services/core/java/com/android/server/am/ActivityManagerService.java