diff options
| author | Craig Mautner <cmautner@google.com> | 2014-11-21 23:01:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-21 23:01:01 +0000 |
| commit | a673263d059997f846fa1765776758c6d06e5131 (patch) | |
| tree | 1c8c64558c1084a235cea5ed0a3b8a588b0bfb81 /docs/html/sdk/api_diff/16 | |
| parent | 21bc2e3e1e30e34d661e3c3cf961eb058ca3834e (diff) | |
| parent | 0a398d7bb477c57508e5a7374e91cb331b689290 (diff) | |
am 0a398d7b: Merge "Treat screen-on while pausing as pause timeout." into lmp-mr1-dev
* commit '0a398d7bb477c57508e5a7374e91cb331b689290':
Treat screen-on while pausing as pause timeout.
Diffstat (limited to 'docs/html/sdk/api_diff/16')
0 files changed, 0 insertions, 0 deletions