diff options
| author | Joe Onorato <joeo@google.com> | 2010-07-28 11:05:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-28 11:05:29 -0700 |
| commit | 17350886d03ace01de437eacee1e11e4e997f9cb (patch) | |
| tree | f8e22252f6a27177d98931cb4c997b8150ac2e5b /docs/html/sdk/api_diff/5/changes | |
| parent | ff0aff1914f617e9cb24944e9f9608a86992df72 (diff) | |
| parent | d3f6c1fa45d0b9aaf467159953ee4bea2ea89188 (diff) | |
am d3f6c1fa: am 0c39b6c6: Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into gingerbread
Merge commit 'd3f6c1fa45d0b9aaf467159953ee4bea2ea89188'
* commit 'd3f6c1fa45d0b9aaf467159953ee4bea2ea89188':
Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
Diffstat (limited to 'docs/html/sdk/api_diff/5/changes')
0 files changed, 0 insertions, 0 deletions