tree 384674d168803483ebcb40fac9ca60a6891b2583
parent 92e64a65ee00054d2248f13eff76ea388e3ac23c
parent beaf3707fa5e853384ef2165b21e05154d51632e
author Wale Ogunwale <ogunwale@google.com> 1466457800 +0000
committer android-build-merger <android-build-merger@google.com> 1466457800 +0000

Merge \"Revert \"Don\'t re-launch activities while the device is sleeping\"\" into nyc-dev
am: beaf3707fa

Change-Id: I1328274d5d331defc274ba010218274105d760e4