Merge commit '6b23b2700c2c5a2766ec2ab23d83a6e3ba7ab26c' into eclair-mr2
* commit '6b23b2700c2c5a2766ec2ab23d83a6e3ba7ab26c':
Fix misspellings in the Settings app.
Merge commit 'a79239b102f7b9c83e31be7b3a47ab50459b6a4f' into eclair-plus-aosp
* commit 'a79239b102f7b9c83e31be7b3a47ab50459b6a4f':
Fix for NPE in #2248683
Merge commit '6b23b2700c2c5a2766ec2ab23d83a6e3ba7ab26c' into eclair-plus-aosp
* commit '6b23b2700c2c5a2766ec2ab23d83a6e3ba7ab26c':
Fix misspellings in the Settings app.
Also fix a problem in type-to-filter. It was looking for substring match
instead of searching on word boundaries. It will now search by word
boundaries (separated by space).
Merge commit '4fcf94c47b5526e1ee64854d7e25bfcac171885b' into eclair-mr2-plus-aosp
* commit '4fcf94c47b5526e1ee64854d7e25bfcac171885b':
b/2226832 Showing Pairing Dialog in the foreground
Merge commit 'c3ace180d0853185da19b49e9668324faa9f468e' into eclair-mr2-plus-aosp
* commit 'c3ace180d0853185da19b49e9668324faa9f468e':
Updated icons for Settings. DO NOT MERGE
Merge commit '5469ff8b3f9966c6f141078b37da5f178b7825e4' into eclair-mr2
* commit '5469ff8b3f9966c6f141078b37da5f178b7825e4':
b/2226832 Showing Pairing Dialog in the foreground
Merge commit '7ceb387ee601655ba72264646e3d8ecf2d74c138' into eclair-mr2
* commit '7ceb387ee601655ba72264646e3d8ecf2d74c138':
Updated icons for Settings. DO NOT MERGE
Merge commit '5469ff8b3f9966c6f141078b37da5f178b7825e4' into eclair-plus-aosp
* commit '5469ff8b3f9966c6f141078b37da5f178b7825e4':
b/2226832 Showing Pairing Dialog in the foreground
Merge commit '7ceb387ee601655ba72264646e3d8ecf2d74c138' into eclair-plus-aosp
* commit '7ceb387ee601655ba72264646e3d8ecf2d74c138':
Updated icons for Settings. DO NOT MERGE
Pairing Dialogs notifications (in the window shade) were not visible in full
screen apps e.g. gallery. Showing Pairing Dialog in the foreground:
1) if the remote device was picked in the device picker in the last minute or
2) if the device was in discoverable mode in the last minute.
Merge commit '60037611a4f4bd9f2a724f9076abb17f553c6bb9' into eclair-mr2-plus-aosp
* commit '60037611a4f4bd9f2a724f9076abb17f553c6bb9':
Import revised translations. DO NOT MERGE
Merge commit 'd7962545aadb31b5ac1a9ff93f5a91168bcae5c6'
* commit 'd7962545aadb31b5ac1a9ff93f5a91168bcae5c6':
b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Merge commit '51dfd4b03563fd5b6fa87a7123d8bf0a9a7ce89d' into eclair-mr2-plus-aosp
* commit '51dfd4b03563fd5b6fa87a7123d8bf0a9a7ce89d':
b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Merge commit '834e5993e4f2f34d5aceb3196601b30231d00b07' into eclair-mr2
* commit '834e5993e4f2f34d5aceb3196601b30231d00b07':
b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Merge commit '834e5993e4f2f34d5aceb3196601b30231d00b07' into eclair-plus-aosp
* commit '834e5993e4f2f34d5aceb3196601b30231d00b07':
b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Merge commit 'f69e5ad5372fbeef76f191f22e6d65202f9c782f'
* commit 'f69e5ad5372fbeef76f191f22e6d65202f9c782f':
b/2238546 Fixed NPE in Settings when Bluetooth "class" is null
Merge commit 'd55c31ead6e52b215f42f351761483386ecacbc2' into eclair-mr2-plus-aosp
* commit 'd55c31ead6e52b215f42f351761483386ecacbc2':
b/2238546 Fixed NPE in Settings when Bluetooth "class" is null
Merge commit '4d004e910732565ddd449c7c525f7d6cbd353392' into eclair-mr2
* commit '4d004e910732565ddd449c7c525f7d6cbd353392':
b/2238546 Fixed NPE in Settings when Bluetooth "class" is null
Merge commit '4d004e910732565ddd449c7c525f7d6cbd353392' into eclair-plus-aosp
* commit '4d004e910732565ddd449c7c525f7d6cbd353392':
b/2238546 Fixed NPE in Settings when Bluetooth "class" is null
Merge commit '35a4c327a94272d7bd1ec5c575e787ea3d5364cc'
* commit '35a4c327a94272d7bd1ec5c575e787ea3d5364cc':
Add backup string for a platform setting to enable or disable
Merge commit 'dd1f7c9e64b9614f5fe3fff9edf4343ee82ab48b' into eclair-mr2-plus-aosp
* commit 'dd1f7c9e64b9614f5fe3fff9edf4343ee82ab48b':
Add backup string for a platform setting to enable or disable
Merge commit '9d6be2baf517462d2cce818c21b25958a40e4f06' into eclair-plus-aosp
* commit '9d6be2baf517462d2cce818c21b25958a40e4f06':
Add backup string for a platform setting to enable or disable
Merge commit '9d6be2baf517462d2cce818c21b25958a40e4f06' into eclair-mr2
* commit '9d6be2baf517462d2cce818c21b25958a40e4f06':
Add backup string for a platform setting to enable or disable
Merge commit '2b42f028f7250f86590a8c39f2ce29936f960b7a' into eclair-mr2-plus-aosp
* commit '2b42f028f7250f86590a8c39f2ce29936f960b7a':
Import revised translations. DO NOT MERGE
Merge commit '8e3c8c209b1f13d1704669887edb47df0a1afc0a' into eclair-mr2
* commit '8e3c8c209b1f13d1704669887edb47df0a1afc0a':
Import revised translations. DO NOT MERGE
Merge commit '8e3c8c209b1f13d1704669887edb47df0a1afc0a' into eclair-plus-aosp
* commit '8e3c8c209b1f13d1704669887edb47df0a1afc0a':
Import revised translations. DO NOT MERGE