OSDN Git Service

Merge \"Merge \\\"Don\\\'t re-launch activities while the device is sleeping\\\"...
authorWale Ogunwale <ogunwale@google.com>
Fri, 17 Jun 2016 20:43:44 +0000 (20:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Jun 2016 20:43:44 +0000 (20:43 +0000)
commit49b77c0efb8e6c80908e2224f120e37684d10e09
treed7f3720313b2fb42c00299001d219ad0dcaa2f09
parentd11b12a34d37995732c5eb481c0f82d0da871389
parentac769204af6887e8462349cddbafa3de8db336d2
Merge \"Merge \\\"Don\\\'t re-launch activities while the device is sleeping\\\" into nyc-dev am: f6e3c9a553 am: 4e9c615769\" into nyc-mr1-dev-plus-aosp
am: ac769204af

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