commit | 4af72f335a30c80a3597e2de587e86d488589476 | [log] [tgz] |
---|---|---|
author | Wale Ogunwale <ogunwale@google.com> | Mon Jun 20 21:31:36 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jun 20 21:31:36 2016 +0000 |
tree | 3f678ca0bc4e0cbd870b4f083aae18492c516c91 | |
parent | 7e346ef8532c28d691236015dba9a79750d326a0 [diff] | |
parent | 4553be6e301e328fc53513858b97c90f318b17c6 [diff] |
Merge \\\"Revert \\\"Don\\\'t re-launch activities while the device is sleeping\\\"\\\" into nyc-dev am: beaf3707fa am: f929560813 am: 4553be6e30 Change-Id: I78c2143c1fed3736cb9bd8714b12dd829b4dcaeb