Merge commit '01a868d73b2c0a8c969a4ad37af0e0a98a9eb156' into eclair-plus-aosp
* commit '01a868d73b2c0a8c969a4ad37af0e0a98a9eb156':
Strings for new Dock settings screen, to get started on the L10N.
Merge commit '04e32ff35fe60cdd62509cff1df24d62cd464f4e' into eclair-plus-aosp
* commit '04e32ff35fe60cdd62509cff1df24d62cd464f4e':
b/2335545 Revert the dock strings back to "For Music and Media"
Merge commit 'e273289cfb74e08ef0ab35afe2ca34a167a533d8' into eclair-plus-aosp
* commit 'e273289cfb74e08ef0ab35afe2ca34a167a533d8':
Import revised translations. DO NOT MERGE
Merge commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350' into eclair-plus-aosp
* commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350':
b/2296110 Dialog for setting up dock audio.
Reimplemented as a Foreground Service just so it can get on top of the Car Dock App.
Added debounce mechanism to not disconnect immediately after getting a undock event.
Each dock now has its own "Remember setting".
Remember Settings is on by default
Change-Id: I80790bdb7c831e2a642365b92433012191aa70c1
Merge commit '0bd445b974292dc3910b6bb85dcee7e7c378968f' into eclair-plus-aosp
* commit '0bd445b974292dc3910b6bb85dcee7e7c378968f':
b/2296110 New Dialog which appears when phone is place on dock.
Merge commit 'e2caf2eefe84418fb1390b24aa24d5ec021438a8' into eclair-plus-aosp
* commit 'e2caf2eefe84418fb1390b24aa24d5ec021438a8':
Feature #2296147 Settings for Car/Desk Dock on certain devices
This inserts a launcher for the Dock settings dialog, if the
device supports it and is currently docked.
The menu item disappears if the phone is not docked in the car/desk dock.
Merge commit '81482b04be2147bf88f96290581cc2fd2093b5a9' into eclair-plus-aosp
* commit '81482b04be2147bf88f96290581cc2fd2093b5a9':
Import revised translations. DO NOT MERGE
Merge commit '8f2fb65b360ebc7ed71ddbc884451536e5e99c03' into eclair-plus-aosp
* commit '8f2fb65b360ebc7ed71ddbc884451536e5e99c03':
Setting in Sound & Display for trackball pulsing on notification. Bug #2238250
Merge commit '76395bc9bc0f2db49d37fd94017c01ca1c8fb1a7' into eclair-plus-aosp
* commit '76395bc9bc0f2db49d37fd94017c01ca1c8fb1a7':
Import revised translations. DO NOT MERGE
Merge commit '18517f50edcfebf41b61965b24e360858db1c5e4' into eclair-plus-aosp
* commit '18517f50edcfebf41b61965b24e360858db1c5e4':
Import revised translations. DO NOT MERGE
Merge commit '83e718f92710c766ef341fdde769b2efc489bef9' into eclair-plus-aosp
* commit '83e718f92710c766ef341fdde769b2efc489bef9':
Import revised translations. DO NOT MERGE
Merge commit '48c451b38824e96b85ab9f5bac8724b07bd2c9e5' into eclair-plus-aosp
* commit '48c451b38824e96b85ab9f5bac8724b07bd2c9e5':
Import revised translations. DO NOT MERGE
Merge commit '6b23b2700c2c5a2766ec2ab23d83a6e3ba7ab26c' into eclair-plus-aosp
* commit '6b23b2700c2c5a2766ec2ab23d83a6e3ba7ab26c':
Fix misspellings in the Settings app.
Merge commit '7ceb387ee601655ba72264646e3d8ecf2d74c138' into eclair-plus-aosp
* commit '7ceb387ee601655ba72264646e3d8ecf2d74c138':
Updated icons for Settings. DO NOT MERGE
Merge commit '9d6be2baf517462d2cce818c21b25958a40e4f06' into eclair-plus-aosp
* commit '9d6be2baf517462d2cce818c21b25958a40e4f06':
Add backup string for a platform setting to enable or disable
Merge commit '8e3c8c209b1f13d1704669887edb47df0a1afc0a' into eclair-plus-aosp
* commit '8e3c8c209b1f13d1704669887edb47df0a1afc0a':
Import revised translations. DO NOT MERGE
Merge commit '0cb3743e93aef81e7669f1e6c81184559e0f8154' into eclair-plus-aosp
* commit '0cb3743e93aef81e7669f1e6c81184559e0f8154':
b/2219381 Gray out Bluetooth Settings for the emulator
Merge commit 'dd45a47bde9cdb9c27cb3ac3529a34f9789782ec' into eclair-plus-aosp
* commit 'dd45a47bde9cdb9c27cb3ac3529a34f9789782ec':
Fix for 1974140. Delete entry if not valid on hitting home.
Merge commit '17fcd476643e27943f548415e49e1be7d8e74ac1' into eclair-plus-aosp
* commit '17fcd476643e27943f548415e49e1be7d8e74ac1':
Import revised translations. DO NOT MERGE
If user doesn't enter an APN or name, then delete the entry on hitting home.
And if user has enough information but doesn't enter a name, then set the
name to "Untitled" to avoid blank APNs in the list.
Merge commit 'e0711522bc5e7c62951b0e429c4b4550feeeabf0' into eclair-plus-aosp
* commit 'e0711522bc5e7c62951b0e429c4b4550feeeabf0':
Use consistent punctuation for the Chinese locale names.
Merge commit '195bc43460967e57e4c1131ba156083a93e0e4e8' into eclair-plus-aosp
* commit '195bc43460967e57e4c1131ba156083a93e0e4e8':
Add Authentication Type field to the APN settings.
