diff options
| author | Joe Onorato <joeo@google.com> | 2010-07-28 10:16:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-28 10:16:39 -0700 |
| commit | d3f6c1fa45d0b9aaf467159953ee4bea2ea89188 (patch) | |
| tree | 40246ba7ef169f97dff65bf771d5a1e7372ca9a4 /docs/html/sdk/api_diff/6/changes | |
| parent | 6fa8888254deb4961dc64c6ac03dc103c9cd8bcf (diff) | |
| parent | 0c39b6c65bcb96ed6438c7d792a67708409d8f0f (diff) | |
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 '0c39b6c65bcb96ed6438c7d792a67708409d8f0f' into gingerbread-plus-aosp
* commit '0c39b6c65bcb96ed6438c7d792a67708409d8f0f':
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/6/changes')
0 files changed, 0 insertions, 0 deletions