OSDN Git Service

Merge \\"Revert \\"Don\\'t re-launch activities while the device is sleeping\\"\...
authorWale Ogunwale <ogunwale@google.com>
Mon, 20 Jun 2016 21:27:47 +0000 (21:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 20 Jun 2016 21:27:47 +0000 (21:27 +0000)
commit4553be6e301e328fc53513858b97c90f318b17c6
tree6bf5e644ac29b605c4c1b58ca757875e76679e63
parentc07a7518d6bfd85fcc1ad15e72cf0fe8014ef0d0
parentf9295608135162c6e6eab2535d404ddec5af725d
Merge \\"Revert \\"Don\\'t re-launch activities while the device is sleeping\\"\\" into nyc-dev am: beaf3707fa
am: f929560813

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