am bacc3aa8: am 97b5b765: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Merge commit 'bacc3aa85ee1a1b5dbf2e92522dde8eb0526bdb7'
* commit 'bacc3aa85ee1a1b5dbf2e92522dde8eb0526bdb7':
Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
Amend previous ndc commit
Add a method to let a properly permissioned app directly
Changed SyncOperation.toKey() to not rely on the implementation of
Squashed commit of the following:
Add more error checking for ndc
PackageManagerService: always install native binaries from .apk
Add PhoneSubInfo.getCompleteVoiceMailNumber.
Fix a bug where we cleaned an apps external data when upgrading it. :(
Skip hostname verification when using insecure factory
Flush binder buffer after setting raw heap to avoid leaking a reference.
Fix issue #2834005: Android Settings.Secure bypass
Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
Verify hostname where possible, and clarify where not.