Merge commit 'c0e34db16864e25946b288cb165ad833b62d3b18' into eclair-plus-aosp
* commit 'c0e34db16864e25946b288cb165ad833b62d3b18':
Add L2tpIpsec case in VpnSettings.processSecrets()
Merge commit 'c52637dfab3178fa4d973ec3b41158903b71454f' into eclair-mr2-plus-aosp
* commit 'c52637dfab3178fa4d973ec3b41158903b71454f':
Fix Settings to show versionName instead of versionCode.
Merge commit 'c197f15486c053e89bc610c7e7b497130f4fb5a7' into eclair-mr2-plus-aosp
* commit 'c197f15486c053e89bc610c7e7b497130f4fb5a7':
Import revised translations. DO NOT MERGE
Merge commit '1cd02caccd4aa5b70ae342de386a21255cf9bed7' into eclair-mr2-plus-aosp
* commit '1cd02caccd4aa5b70ae342de386a21255cf9bed7':
Add L2tpIpsec case in VpnSettings.processSecrets()
Merge commit '06a111be6d3ccf44de545a084302c2085cbb07de' into eclair-mr2
* commit '06a111be6d3ccf44de545a084302c2085cbb07de':
Import revised translations. DO NOT MERGE
Merge commit 'c0e34db16864e25946b288cb165ad833b62d3b18' into eclair-mr2
* commit 'c0e34db16864e25946b288cb165ad833b62d3b18':
Add L2tpIpsec case in VpnSettings.processSecrets()
Merge commit 'a8f2f72da8693418f867de9c904eb250b7aae4ff' into eclair-plus-aosp
* commit 'a8f2f72da8693418f867de9c904eb250b7aae4ff':
Add the auth_alg field back.
Merge commit '6de9fb390b9eab0dbaf9709db5149eefc18724da' into eclair-plus-aosp
* commit '6de9fb390b9eab0dbaf9709db5149eefc18724da':
Import revised translations. DO NOT MERGE
Merge commit '6e6d2362ccd119e51839a4f306c26783f634ab15' into eclair-plus-aosp
* commit '6e6d2362ccd119e51839a4f306c26783f634ab15':
Check if a device is added to the cache before returning.
Merge commit '9767612cc8207f906173dc9459b45cd07d881c4e' into eclair-plus-aosp
* commit '9767612cc8207f906173dc9459b45cd07d881c4e':
SecuritySettings: fix a the status before handling the intent.
Merge commit 'e61a2403a64bd711dcf3abb36594eb6545601c80' into eclair-plus-aosp
* commit 'e61a2403a64bd711dcf3abb36594eb6545601c80':
SecuritySettings: set the check box before further processing.
Merge commit 'd2fa30baee10b755704beded16e8cf0ab2eb502f' into eclair-plus-aosp
* commit 'd2fa30baee10b755704beded16e8cf0ab2eb502f':
WifiSettings: use keystore namespace instead of blobl.
Merge commit 'a8f2f72da8693418f867de9c904eb250b7aae4ff' into eclair-mr2
* commit 'a8f2f72da8693418f867de9c904eb250b7aae4ff':
Add the auth_alg field back.
Merge commit '6de9fb390b9eab0dbaf9709db5149eefc18724da' into eclair-mr2
* commit '6de9fb390b9eab0dbaf9709db5149eefc18724da':
Import revised translations. DO NOT MERGE
This change is to fix the issue http://b/issue?id=2161539.
The auth_alg field is required for auth. type 'SHARED' with WEP mode, it will
not be automatically selected as claimed. The change has been verified on
Linksys WRT54G.
Merge commit '3a0fc70b691201cf1806661224c94bd564354f63'
* commit '3a0fc70b691201cf1806661224c94bd564354f63':
b/2154576 Fixed the problem were some BT profiles were not connected when first UUID notification of many didn't have all the UUIDs
Merge commit '7c8a08d51389e1c2c0411a1a4a12646880199e01'
* commit '7c8a08d51389e1c2c0411a1a4a12646880199e01':
Use a custom system icon for native processes.
Merge commit 'f30ebb8bc86482e057f68083f0c09f7da1c89652'
* commit 'f30ebb8bc86482e057f68083f0c09f7da1c89652':
b/2154978 Show only connectable profiles (Headset and& A2DP but not OPP) in Bluetooth Device Advance Options aka "Connect to..."
For incoming connections, we don't have the device in the Settings cache.
After we tried to readPairedDevices, check if we added to the cache.
If we successfully added it, continue with the connections, else bail out.
Bug id: 2160617
Change-Id: I25f2afba8ef6d2c32a7940f967cf12f1321ad9e0
Merge commit 'eedf612f83c78eb8c60cb8b9034c25bd627eda8f'
* commit 'eedf612f83c78eb8c60cb8b9034c25bd627eda8f':
b/2154576 Fixed the problem were some BT profiles were not connected when first UUID notification of many didn't have all the UUIDs
