| commit | c9077221bb339dd273394b27e8eb4d6cdb163a4d | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Mon Jun 20 23:16:49 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jun 20 23:16:50 2016 +0000 |
| tree | 264881259056333f5d5ad385fce11bfdc6918f4a | |
| parent | 7d145e279b445a3faf5088dfa5a8f3ff444c50d2 [diff] | |
| parent | a552f9deda84e0ef1acc832d6d6623e1ee757ce6 [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