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:51 +0000 (20:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Jun 2016 20:43:51 +0000 (20:43 +0000)
am: ca0b8d9096

Change-Id: Ibe4fa705e04fd63b1225e8fc27ef4ab0cb34f15d


Trivial merge