Merge commit 'e6fdab7f005cc06df989c97907c3cc3060692121' into kraken
* commit 'e6fdab7f005cc06df989c97907c3cc3060692121':
Forcibly unmount the sdcard after N retries.
Merge commit 'fede9aed2b1f0b6316e18cbfa58be593fa7eb14c' into froyo-plus-aosp
* commit 'fede9aed2b1f0b6316e18cbfa58be593fa7eb14c':
Forcibly unmount the sdcard after N retries.
Merge commit '7eeb44f20527caaad618e28ba511e7661f5904cb' into kraken
* commit '7eeb44f20527caaad618e28ba511e7661f5904cb':
Disable tethering when airplane mode is enabled
Merge commit 'b2e6c01f449f3fd4effee7029518684deb4e98f6' into froyo-plus-aosp
* commit 'b2e6c01f449f3fd4effee7029518684deb4e98f6':
Disable tethering when airplane mode is enabled
Merge commit '16419aca40e9d570eef4f51133ba1b734d3012c0' into kraken
* commit '16419aca40e9d570eef4f51133ba1b734d3012c0':
Guard against NPE in SearchManagerService
Merge commit '7d2511b722808dfc9cadd3f0f49375fcb738df56' into froyo-plus-aosp
* commit '7d2511b722808dfc9cadd3f0f49375fcb738df56':
Guard against NPE in SearchManagerService
Merge commit '703cb72442461a3cfb3ffd0d15968d7c40eaba65' into kraken
* commit '703cb72442461a3cfb3ffd0d15968d7c40eaba65':
Redo the look of the recent apps switcher
Merge commit '7d8866f9ef026870d4735d6f2ede49525150e53e' into kraken
* commit '7d8866f9ef026870d4735d6f2ede49525150e53e':
Redo the look of the recent apps switcher.
Merge commit 'fa588fc37420a1a4d287e6307700ca310897308a' into froyo-plus-aosp
* commit 'fa588fc37420a1a4d287e6307700ca310897308a':
Redo the look of the recent apps switcher
Merge commit 'c94dad83be792928206363cb43524a68b6a62ffe' into kraken
* commit 'c94dad83be792928206363cb43524a68b6a62ffe':
2568467 System crash when installing corrupt APK
Merge commit '6e52b5d76850ee60bbef2f3d8a2e47bd589e28e8' into froyo-plus-aosp
* commit '6e52b5d76850ee60bbef2f3d8a2e47bd589e28e8':
2568467 System crash when installing corrupt APK
Merge commit 'bf81cb91aa584d3b52d807aa4134a1a90569de31' into kraken
* commit 'bf81cb91aa584d3b52d807aa4134a1a90569de31':
Fix 2325549: Allow up to 4 lines of summary text in Settings
Merge commit 'a6cce790b24debae49f1df9f039e83e3e29e5cd1' into froyo-plus-aosp
* commit 'a6cce790b24debae49f1df9f039e83e3e29e5cd1':
Fix 2325549: Allow up to 4 lines of summary text in Settings
Merge commit 'e725a9634b0cea150b29755ed94c53e621b4f273' into kraken
* commit 'e725a9634b0cea150b29755ed94c53e621b4f273':
remove OTA packages from the old (pre-froyo) updater
Merge commit '4c59ca8bdb02bf0ca0bb090ecb39d94e260ab2f0' into froyo-plus-aosp
* commit '4c59ca8bdb02bf0ca0bb090ecb39d94e260ab2f0':
remove OTA packages from the old (pre-froyo) updater
Merge commit 'ca5e7de82b18dcd5fb8f617b40b45c95edce8c3e' into kraken
* commit 'ca5e7de82b18dcd5fb8f617b40b45c95edce8c3e':
Adding a feature definition for touchscreens that was overlooked in the last
Merge commit '16197a246fdeff0167f9abdc6a3da5d83759993d' into kraken
* commit '16197a246fdeff0167f9abdc6a3da5d83759993d':
Revert to previous text selection behavior
Merge commit '21390f08138801f9e008917c0c0149839a80d002' into froyo-plus-aosp
* commit '21390f08138801f9e008917c0c0149839a80d002':
Adding a feature definition for touchscreens that was overlooked in the last
Merge commit '0db37997366a4d781af48be758a9d90b6d07d7d5' into froyo-plus-aosp
* commit '0db37997366a4d781af48be758a9d90b6d07d7d5':
Revert to previous text selection behavior
Merge commit 'f84207f6ca90307b10d94e484baf55330d644c1d' into kraken
* commit 'f84207f6ca90307b10d94e484baf55330d644c1d':
Add an extra for the Disconnect Headset State.
Merge commit 'c6af69b2684e1a95368f52e1f1614595f85c9c12' into froyo-plus-aosp
* commit 'c6af69b2684e1a95368f52e1f1614595f85c9c12':
Add an extra for the Disconnect Headset State.
Merge commit '733a2f654934d452b2febf6f80cd1136830758d5' into kraken
* commit '733a2f654934d452b2febf6f80cd1136830758d5':
Fix a crash in BatteryStatsImpl, due to a previous fix.
Merge commit '1b4c0d702066794b9ce97b02721aa9e552997381' into froyo-plus-aosp
* commit '1b4c0d702066794b9ce97b02721aa9e552997381':
Fix a crash in BatteryStatsImpl, due to a previous fix.
Merge commit '6c9356028cc94259c9d1f5f937d9cca1f45914d3' into kraken
* commit '6c9356028cc94259c9d1f5f937d9cca1f45914d3':
Make createVideoThumbnail and createImageThumbnail look consistent.
Merge commit '44dcf658718fcc0b563dcad50fb59e8fe507cd0a' into froyo-plus-aosp
* commit '44dcf658718fcc0b563dcad50fb59e8fe507cd0a':
Make createVideoThumbnail and createImageThumbnail look consistent.
Merge commit '6cf2c14f65336cf32dba5faa812cc2eca8c31a6a' into kraken
* commit '6cf2c14f65336cf32dba5faa812cc2eca8c31a6a':
check for webviewcore before reading settings