commit | c70323ac00e7a47f0b6d7ea3471bb544c35f5baa | [log] [tgz] |
---|---|---|
author | Wale Ogunwale <ogunwale@google.com> | Mon Jun 20 23:26:32 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jun 20 23:26:32 2016 +0000 |
tree | b9ea1074de02ec760ebb9dda3d7d71d90cc36625 | |
parent | 93bb29ddd87a203a472557e8c8515d25928da1b6 [diff] | |
parent | c9077221bb339dd273394b27e8eb4d6cdb163a4d [diff] |
Merge \"Merge \\\"Don\\\'t re-launch stopped activities while the device is sleeping\\\" into nyc-dev am: f159b74608 am: 6d296286e4\" into nyc-mr1-dev-plus-aosp am: c9077221bb Change-Id: If2a00e182c0e622ac42cad97c2683929afdbb702