Merge commit 'e304b9f4f7f5bf07522fcc05615d172abd6c52a3' into eclair-plus-aosp
* commit 'e304b9f4f7f5bf07522fcc05615d172abd6c52a3':
Add a intent extra to only show the access points in the settings menu.
Merge commit '53250b3aa8c85adb31bfe9db30907f72acab7103' into eclair-mr2-plus-aosp
* commit '53250b3aa8c85adb31bfe9db30907f72acab7103':
Import revised translations. DO NOT MERGE
Merge commit '8355d9343455eaacf559f0df0e752f236b7464d2' into eclair-mr2
* commit '8355d9343455eaacf559f0df0e752f236b7464d2':
Import revised translations. DO NOT MERGE
Merge commit '8355d9343455eaacf559f0df0e752f236b7464d2' into eclair-plus-aosp
* commit '8355d9343455eaacf559f0df0e752f236b7464d2':
Import revised translations. DO NOT MERGE
Merge commit '28309905ad2bcaff26d6773b2a20399296196e2e'
* commit '28309905ad2bcaff26d6773b2a20399296196e2e':
Use radio hunting time in addition to signal strength for cell standby computation. Fixes#2176141
Merge commit '8e10261e87cf4b474cde0acb5fd837272e8c147e' into eclair-mr2-plus-aosp
* commit '8e10261e87cf4b474cde0acb5fd837272e8c147e':
Use radio hunting time in addition to signal strength for cell standby computation. Fixes#2176141
Merge commit '941c3b1794203b48a8aa2e9d6f04c09d412262bd' into eclair-plus-aosp
* commit '941c3b1794203b48a8aa2e9d6f04c09d412262bd':
Use radio hunting time in addition to signal strength for cell standby computation. Fixes#2176141
Merge commit '941c3b1794203b48a8aa2e9d6f04c09d412262bd' into eclair-mr2
* commit '941c3b1794203b48a8aa2e9d6f04c09d412262bd':
Use radio hunting time in addition to signal strength for cell standby computation. Fixes#2176141
The extracted bits will move into the HTC vendor tree, and it (or
similar settings for other vendors) can be accessed via a generic
OEM_RADIO_INFO activity.
Addresses issue:
http://buganizer/issue?id=1645706
Change-Id: Iec5461bcb3e241a1230f5f6d53baa3bb838ff4a9
We will use the System.SCREEN_BRIGHTNESS_MODE Settings value instead.
Change-Id: I1850549f513e3541b5761aae28ebc615410377de
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '880daa29161330c97e65101659ed6b88066a3dbe' into eclair-mr2-plus-aosp
* commit '880daa29161330c97e65101659ed6b88066a3dbe':
Import revised translations. DO NOT MERGE
Merge commit '8271a531b73ffa82202a223d28581c7c44e03d35'
* commit '8271a531b73ffa82202a223d28581c7c44e03d35':
Fix issue #2185893: Can not install 3D Media Gallery
Merge commit 'ae59063b7afc234216050c9b5a99b1dc878754e7'
* commit 'ae59063b7afc234216050c9b5a99b1dc878754e7':
Add saving/restoring state in CredentialInstaller and ...
Merge commit 'c0ef160be719ae320e9d9574898ec9eef01ceb55'
* commit 'c0ef160be719ae320e9d9574898ec9eef01ceb55':
Push down the supplicant-specific double-quote handling to framework.
Merge commit '3539cc5ef317b58c0e12c083d7cbda942658cad0' into eclair-mr2-plus-aosp
* commit '3539cc5ef317b58c0e12c083d7cbda942658cad0':
Fix issue #2185893: Can not install 3D Media Gallery
Merge commit '9f1900dc05773a0659030e21a8c2fa1641655669' into eclair-plus-aosp
* commit '9f1900dc05773a0659030e21a8c2fa1641655669':
Fix issue #2185893: Can not install 3D Media Gallery
Merge commit '9f1900dc05773a0659030e21a8c2fa1641655669' into eclair-mr2
* commit '9f1900dc05773a0659030e21a8c2fa1641655669':
Fix issue #2185893: Can not install 3D Media Gallery
Merge commit '978a95129323da61aaf2dc0d39302ae0cb043ba2'
* commit '978a95129323da61aaf2dc0d39302ae0cb043ba2':
Show an error message when the remote side cancels the authentication
Import revised translations. DO NOT MERGE
Merge commit '875a034b6eed70e1928c96f336d9f5831f4023ea'
* commit '875a034b6eed70e1928c96f336d9f5831f4023ea':
b/2173596 Cancel Bluetooth scanning when the user leaves Bluetooth Settings.
Merge commit 'f20623b2b6f75ecbbe1ac5de4994dd2944083d7b' into eclair-mr2-plus-aosp
* commit 'f20623b2b6f75ecbbe1ac5de4994dd2944083d7b':
Add saving/restoring state in CredentialInstaller and ...
Merge commit 'a5b7b45b6fe125b5f04d248b0f624eee9a7ea7da' into eclair-mr2-plus-aosp
* commit 'a5b7b45b6fe125b5f04d248b0f624eee9a7ea7da':
Push down the supplicant-specific double-quote handling to framework.
