OSDN Git Service

Merge "Allow apps to bypass Power Save restrictions when launched from a Notification...
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 27 May 2016 19:58:22 +0000 (19:58 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 27 May 2016 19:58:24 +0000 (19:58 +0000)
commitefa291a8605e91d775faf46ada349ec7f81fcdb9
tree38dcaa406135ba5c6be0dfd2448b71a6ff7d636d
parent4f401f24c79c26a0554331bf13948e402c611015
parenta1b79bfd7a15006a93da933695359765e0fee495
Merge "Allow apps to bypass Power Save restrictions when launched from a Notification's PendingIntent." into nyc-dev
services/core/java/com/android/server/am/ActiveServices.java
services/core/java/com/android/server/am/ActivityManagerService.java