| commit | 0a398d7bb477c57508e5a7374e91cb331b689290 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Fri Nov 21 22:45:07 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Nov 21 22:45:08 2014 +0000 |
| tree | afdb210f882b249337bd1f829e8a6c88a1bcc6db | |
| parent | cb721bf674e3b36a7c16fcc8f61646404d348bd3 [diff] | |
| parent | f49b0a45aece9bad42d81a09eeceaf1b5b6c06df [diff] |
Merge "Treat screen-on while pausing as pause timeout." into lmp-mr1-dev