OSDN Git Service
Eric Fischer [Thu, 7 Jul 2011 21:51:58 +0000 (14:51 -0700)]
Merge "Import revised translations."
Chia-chi Yeh [Thu, 7 Jul 2011 21:29:12 +0000 (14:29 -0700)]
Merge "VpnSettings: pass certificates to racoon directly."
Chia-chi Yeh [Thu, 7 Jul 2011 19:49:18 +0000 (12:49 -0700)]
VpnSettings: pass certificates to racoon directly.
Also fix some style issues.
Change-Id: I7ca46d0cc3038f21ef5904d4515e90907a21d613
Matthew Xie [Thu, 7 Jul 2011 19:27:41 +0000 (12:27 -0700)]
Merge "Show user dialog for BT connection and phonebook access"
Eric Fischer [Thu, 7 Jul 2011 18:49:07 +0000 (11:49 -0700)]
Import revised translations.
Change-Id: I9f305f5f3c37e90022e21deb5cf262484a5360de
Brian Carlstrom [Wed, 6 Jul 2011 22:13:03 +0000 (15:13 -0700)]
Set progress bar to 0 when done so that will not come back as full
Change-Id: I766e852d029168433a0d47c93dc3110a053f712c
Brian Carlstrom [Wed, 6 Jul 2011 20:45:07 +0000 (13:45 -0700)]
Merge "Convert CA loading from spinning wheel to progress bar"
Brian Carlstrom [Wed, 6 Jul 2011 20:15:03 +0000 (13:15 -0700)]
Convert CA loading from spinning wheel to progress bar
Change-Id: I3d9d596cbdf3ac4751b7b2e297faa0f667d2de02
Brian Carlstrom [Wed, 6 Jul 2011 19:06:20 +0000 (12:06 -0700)]
Merge "Improved presentation of CA list"
Brian Carlstrom [Wed, 6 Jul 2011 06:51:39 +0000 (23:51 -0700)]
Improved presentation of CA list
Change-Id: Ibc6dd9d553c3f7f53453fb43e9842afe789d8b50
Mike Lockwood [Thu, 30 Jun 2011 18:47:46 +0000 (14:47 -0400)]
Super rough implementation of new USB settings
There does not seem to be a way to implement radio buttons in a settings screen,
so I am using check boxes as a temporary hack.
Change-Id: I2d2c7931f689ff04608662b64aafc4862cfef48e
Signed-off-by: Mike Lockwood <lockwood@android.com>
Chia-chi Yeh [Mon, 4 Jul 2011 10:38:18 +0000 (03:38 -0700)]
Merge "VpnSettings: add status report."
Chia-chi Yeh [Mon, 4 Jul 2011 10:17:33 +0000 (03:17 -0700)]
VpnSettings: add status report.
Change-Id: Ia050d997524b39868e6acce82d12b0415909ab77
satok [Mon, 4 Jul 2011 07:27:53 +0000 (16:27 +0900)]
Update settings for aux imes
Change-Id: I7528241eb0882fa5fae2a80e380375683cce2075
Chia-chi Yeh [Sun, 3 Jul 2011 10:12:46 +0000 (03:12 -0700)]
VpnSettings: rename some variables.
Change-Id: I0550bebc55a42ad11768729d098ff5258442747e
Chia-chi Yeh [Sun, 3 Jul 2011 00:45:23 +0000 (17:45 -0700)]
VpnSettings: switch to the new user interface.
Change-Id: I7158cd8f146677b2823cfa936792fd232a37ae28
Chia-chi Yeh [Sun, 3 Jul 2011 00:29:09 +0000 (17:29 -0700)]
Merge changes I266f8403,Ia4dc4b23
* changes:
VpnSettings: hook up the legacy VPN with IConnectivityManager.
VpnSettings: IPSec Hybrid RSA does not need user certificate.
Chia-chi Yeh [Sun, 3 Jul 2011 00:26:26 +0000 (17:26 -0700)]
VpnSettings: hook up the legacy VPN with IConnectivityManager.
The status report is not implemented yet.
Change-Id: I266f840371e3698f779124d5e67bafe4d272cd94
Chia-chi Yeh [Sun, 3 Jul 2011 00:18:37 +0000 (17:18 -0700)]
VpnSettings: IPSec Hybrid RSA does not need user certificate.
Apparently I was confused...
Change-Id: Ia4dc4b2399cffaf2e7a738b93212e821eb6d481d
Dianne Hackborn [Sat, 2 Jul 2011 02:09:56 +0000 (19:09 -0700)]
Merge "Move the main interesting DevTools settings into the main settings app."
Dianne Hackborn [Sat, 2 Jul 2011 01:56:09 +0000 (18:56 -0700)]
Move the main interesting DevTools settings into the main settings app.
These are in the "development" section of the settings app, expanding
on ADB and other stuff that is already there.
Change-Id: I61a4955df0c548dcf1f39be46d21e8b8d02e454a
Gilles Debunne [Fri, 1 Jul 2011 22:04:20 +0000 (15:04 -0700)]
Merge "AdvancedSettings replaced by AdvancedWifiSettings"
Gilles Debunne [Fri, 1 Jul 2011 21:25:46 +0000 (14:25 -0700)]
Merge "Fixed titles that differ from their link titles"
John Wang [Fri, 1 Jul 2011 16:21:16 +0000 (09:21 -0700)]
am
ab824c81: (-s ours) am
f44308a7: Display FCC id for LTE in Settings.
* commit '
ab824c8161207c6e957440b66a899cd9656b1ddf':
Display FCC id for LTE in Settings.
Chia-chi Yeh [Fri, 1 Jul 2011 06:36:52 +0000 (23:36 -0700)]
Merge "VpnSettings: rename some fields."
Chia-chi Yeh [Fri, 1 Jul 2011 06:34:53 +0000 (23:34 -0700)]
VpnSettings: rename some fields.
Change-Id: I999b773192d167f21c4a684c1864c37b9a433390
Jim Miller [Fri, 1 Jul 2011 02:25:16 +0000 (19:25 -0700)]
Merge "Fix
4686480: Update ChooseLockPatternTutorial"
Gilles Debunne [Fri, 1 Jul 2011 02:09:28 +0000 (19:09 -0700)]
Fixed titles that differ from their link titles
Change-Id: Ifa7138a907a6adca05b8906b77f185c78583bff5
Jim Miller [Fri, 1 Jul 2011 01:09:06 +0000 (18:09 -0700)]
Fix
4686480: Update ChooseLockPatternTutorial
- Shorten description string to fit on one page
- Use new scalable LockPatternView to show example pattern.
Change-Id: I1204b6de9da05d9d3f4e503bec2fc4fb3034a4b3
Brian Carlstrom [Fri, 1 Jul 2011 01:06:31 +0000 (18:06 -0700)]
Merge "Fix TrustedCredentialsSettings for small screens"
Brian Carlstrom [Thu, 30 Jun 2011 17:41:02 +0000 (10:41 -0700)]
Fix TrustedCredentialsSettings for small screens
Change-Id: I01149a88b044d0f95db01039aabba62666e8f397
Gilles Debunne [Fri, 1 Jul 2011 00:20:33 +0000 (17:20 -0700)]
AdvancedSettings replaced by AdvancedWifiSettings
Change-Id: Ie51d14c9961e8780c8774bbe56e113cf85357817
John Wang [Thu, 30 Jun 2011 23:41:15 +0000 (16:41 -0700)]
am
f44308a7: Display FCC id for LTE in Settings.
* commit '
f44308a78d35db9cc211f26cd811c067460b18f1':
Display FCC id for LTE in Settings.
John Wang [Thu, 30 Jun 2011 21:31:44 +0000 (14:31 -0700)]
Display FCC id for LTE in Settings.
If ro.ril.fccid is set by RIL, display it at Settings -> About Tablet -> FCC Equipment ID.
bug:
4965501
Change-Id: I920ab071bf1997c4fbf3ce81f88e24f512d004c3
Gilles Debunne [Thu, 30 Jun 2011 22:44:05 +0000 (15:44 -0700)]
Bluetooth messages improved.
Tap to pair in place of searching. Message when no device is found.
Change-Id: I0a4b1fa140e8a30b154ae2686e9c75d3768fc44e
Amith Yamasani [Thu, 30 Jun 2011 19:09:34 +0000 (12:09 -0700)]
Merge "Re-enable hardware acceleration. Driver bug seems fixed."
Amith Yamasani [Thu, 30 Jun 2011 19:07:41 +0000 (12:07 -0700)]
Re-enable hardware acceleration. Driver bug seems fixed.
Bug:
4883047
Change-Id: If6aae8fdff8a0d144e595f6e7cf4241800d18554
Amith Yamasani [Thu, 30 Jun 2011 18:06:52 +0000 (11:06 -0700)]
Fix a crash on certain devices in Storage settings.
Bug:
4980974
Change-Id: If4b89f9cb1813c30ced6d7093381a01a5aa00346
satok [Mon, 27 Jun 2011 14:44:01 +0000 (23:44 +0900)]
Implement new UI for IME settings
Bug:
4645160
Change-Id: If9046e7e96732f6ee4c0594cc66622b6462bdec9
Matthew Xie [Tue, 28 Jun 2011 01:21:25 +0000 (18:21 -0700)]
Show user dialog for BT connection and phonebook access
Show user dialog for incoming BT connection requests from unknown
devices. Move phone book access permission dialog from bluetooth to settings.
The permision dialog pops up to the screen properly instead of
always as notification. AT+CPBR will also use the permission dialog
to ask for user permission.
bug
4489572
Change-Id: Ic1e74b2a9416a462cac4f519240a313691da90c4
Dianne Hackborn [Thu, 30 Jun 2011 00:37:47 +0000 (17:37 -0700)]
Merge "Fix up storage UI for old USB storage."
Amith Yamasani [Thu, 30 Jun 2011 00:31:49 +0000 (17:31 -0700)]
Merge "Add PowerUsageSummary to proguard list."
Amith Yamasani [Thu, 30 Jun 2011 00:24:14 +0000 (17:24 -0700)]
Add PowerUsageSummary to proguard list.
Bug:
4975279
Change-Id: I8e36dd6ce6f0e6a7859af00e7980e636933140fb
Gilles Debunne [Wed, 29 Jun 2011 22:59:21 +0000 (15:59 -0700)]
Merge "Double list in Bluetooth Settings"
Dianne Hackborn [Tue, 28 Jun 2011 21:51:12 +0000 (14:51 -0700)]
Fix up storage UI for old USB storage.
- In the storage overview, if storage is not emulated then we have a
new first section showing internal storage.
- In manage applications, we know show storage use on the SD card
separately from internal storage use.
Change-Id: I7eb993f59fdb5de5f5dcfe4a3bc2b95ae30d754a
Chia-chi Yeh [Wed, 29 Jun 2011 22:33:58 +0000 (15:33 -0700)]
Merge "VpnSettings: generate arguments for PPTP and L2TP IPSec VPNs."
Chia-chi Yeh [Wed, 29 Jun 2011 22:29:28 +0000 (15:29 -0700)]
VpnSettings: generate arguments for PPTP and L2TP IPSec VPNs.
Change-Id: Ia58afa2f6f6d4b1b208bf6b893b8b7712154bdbf
Brian Carlstrom [Wed, 29 Jun 2011 03:05:46 +0000 (20:05 -0700)]
Merge "Follow naming conventions of proguard.flags"
Brian Carlstrom [Wed, 29 Jun 2011 02:57:14 +0000 (19:57 -0700)]
Follow naming conventions of proguard.flags
Change-Id: Idbd136fb25447aa1f6629d8caa17b87924ed3936
Gilles Debunne [Tue, 28 Jun 2011 21:01:50 +0000 (14:01 -0700)]
Double list in Bluetooth Settings
Paired devices are listed first (from cache), followed by unpaired ones.
A scan is only started on user request or when there is no paired device
(should it be when there is no paired *connected* device?).
Wrench icon only displayed for paired devices.
Wrench click listener no longer uses mDeviceSettings which is unreliable
with ListView view recycling.
Fixed blinking ProgressCategory when the category was first in the list.
Change-Id: Ie749883426c12bd354da64733bd04b00304bc1f5
Daisuke Miyakawa [Tue, 28 Jun 2011 22:58:34 +0000 (15:58 -0700)]
Remove call settings menu
It will be shown in Contacts app instead
Bug:
4971637
Change-Id: I081708d4b2cf296d0e37dd20f6ac82f37438d9f0
Jim Miller [Tue, 28 Jun 2011 19:58:14 +0000 (12:58 -0700)]
Merge "Fix
4686480: Cleanup LockScreen settings"
Jim Miller [Tue, 21 Jun 2011 21:13:10 +0000 (14:13 -0700)]
Fix
4686480: Cleanup LockScreen settings
This fix updates the style for buttons to better conform to the screen
by using weightSums.
It also makes layouts much more flexible across platforms by making
better use of the square aspect feature of LockPatternView.
Change-Id: I63677790bf0ac52707c8c356540ecd5dc50ca33b
Gilles Debunne [Tue, 28 Jun 2011 18:39:46 +0000 (11:39 -0700)]
Merge "Split ActionBar in Settings"
Gilles Debunne [Tue, 28 Jun 2011 18:38:42 +0000 (11:38 -0700)]
Merge "Bug
4950070: correct title in Settings"
Gilles Debunne [Tue, 28 Jun 2011 18:38:20 +0000 (11:38 -0700)]
Merge "Minor changes in Settings"
Jason parks [Tue, 28 Jun 2011 16:10:06 +0000 (09:10 -0700)]
Merge "Check to see if the power source is a valid charger."
Narayan Kamath [Tue, 28 Jun 2011 08:44:46 +0000 (09:44 +0100)]
Fix a bug in the TTS settings.
Send the CheckVoiceData intent to the currently
selected engine.
Change-Id: I63d4b7fc935126a0fe7c5717b2455bcf11135b8b
Isaac Levy [Tue, 28 Jun 2011 01:30:19 +0000 (18:30 -0700)]
Merge "Add WifiWatchdogService toggle to Wifi Settings"
Isaac Levy [Mon, 27 Jun 2011 22:48:15 +0000 (15:48 -0700)]
Add WifiWatchdogService toggle to Wifi Settings
Toggle is located in Settings->Wifi Settings->Advanced Wifi Settings
Change-Id: I0f8f2b6353842dae0b47dca1dd48994e42505169
Gilles Debunne [Mon, 27 Jun 2011 19:00:49 +0000 (12:00 -0700)]
Split ActionBar in Settings
Made menu item visible to force action bar, changed style.
Also change parent_fragment for items that have been moved to top level (wifi,
bluetooth, development, battery).
Change-Id: I62932ba55356abdfbf94942f5b4efaa0f15dbd6a
Eric Fischer [Mon, 27 Jun 2011 23:43:37 +0000 (16:43 -0700)]
am
d2157460: am
6a078ed3: (-s ours) am
a18484fb: Import new translations.
* commit '
d21574604a3c68487f952a16bc9b2f384dea05cd':
Import new translations.
Eric Fischer [Mon, 27 Jun 2011 23:40:59 +0000 (16:40 -0700)]
am
6a078ed3: (-s ours) am
a18484fb: Import new translations.
* commit '
6a078ed3d5808e0951a1e0cb8a47fdf210cf884b':
Import new translations.
Eric Fischer [Mon, 27 Jun 2011 23:37:03 +0000 (16:37 -0700)]
am
a18484fb: Import new translations.
* commit '
a18484fb3819feac248255d6ce509049330aca1b':
Import new translations.
Brian Carlstrom [Sun, 26 Jun 2011 23:05:21 +0000 (16:05 -0700)]
CA certificate settings fragment
Change-Id: I8d4b595d6cc8d20be9bea655c7674c86a9183818
Marco Nelissen [Mon, 27 Jun 2011 21:58:57 +0000 (14:58 -0700)]
Merge "Fix crash in Settings"
Eric Fischer [Mon, 27 Jun 2011 21:50:05 +0000 (14:50 -0700)]
Import new translations.
Change-Id: I7b45aed12328a25b81878f29364bcc837c956509
Dianne Hackborn [Mon, 27 Jun 2011 21:15:10 +0000 (14:15 -0700)]
am
c9a477ae: am
e3cfa9bc: am
13bac39d: Remove obsolete compat mode UI.
* commit '
c9a477aeaccda8a6fec48ee02ef04d5f7285097a':
Remove obsolete compat mode UI.
Marco Nelissen [Mon, 27 Jun 2011 21:11:26 +0000 (14:11 -0700)]
Fix crash in Settings
Change-Id: Idfc3a7e91caa1d8007db0c4bee856cfe0cbd2905
Gilles Debunne [Mon, 27 Jun 2011 18:19:16 +0000 (11:19 -0700)]
Bug
4950070: correct title in Settings
isMultiPane does not seem to be adequate for these tests.
It actually may have to be changed...
Change-Id: I23ddca31bb0324c1473f1a7048db3d6271583414
Chia-chi Yeh [Mon, 27 Jun 2011 02:46:38 +0000 (19:46 -0700)]
Merge "Settings: add a new layout for VpnSettings."
Chia-chi Yeh [Mon, 27 Jun 2011 02:45:21 +0000 (19:45 -0700)]
Settings: add a new layout for VpnSettings.
Change-Id: I12b89771621e2e1b8ceea6e899e1a27dae6fac08
Chia-chi Yeh [Mon, 27 Jun 2011 02:40:12 +0000 (19:40 -0700)]
Merge "Settings: add a new layout for VpnDialog."
Chia-chi Yeh [Mon, 27 Jun 2011 02:39:18 +0000 (19:39 -0700)]
Settings: add a new layout for VpnDialog.
Change-Id: Ib9d00dc5f56933db60aa08bce489343b00281e28
Chia-chi Yeh [Mon, 27 Jun 2011 02:26:15 +0000 (19:26 -0700)]
Merge "Settings: revise VpnSettings."
Chia-chi Yeh [Mon, 27 Jun 2011 02:17:14 +0000 (19:17 -0700)]
Settings: revise VpnSettings.
Make the style closer to other settings.
Profiles are saved in KeyStore with optional account information.
Not adapt to IConnectivityManager yet.
Change-Id: I9d7a0c14b253a0b355499c5e558b0761fa24ea22
Jeff Sharkey [Sat, 25 Jun 2011 06:13:13 +0000 (23:13 -0700)]
Merge "Fix animation bugs, stop disabled sweep touches."
Jeff Sharkey [Sat, 25 Jun 2011 00:30:27 +0000 (17:30 -0700)]
Fix animation bugs, stop disabled sweep touches.
Change sweep drawables to crossfade correctly between states, and
work around
4946591 by nesting container one level deeper. Also wait
until first layout pass is finished before applying LayoutTransition.
Prevent touches from reaching sweeps when chart is disabled. Also
bring back log scale for data.
Change-Id: I2194714ab075fd32525681119f30427c1b96fc50
Gilles Debunne [Wed, 22 Jun 2011 17:12:04 +0000 (10:12 -0700)]
Minor changes in Settings
Battery moved to main menu.
Change-Id: I0db89c197a1256aaac35ceb95bfa4a567ea6613f
David Brown [Mon, 20 Jun 2011 19:38:45 +0000 (12:38 -0700)]
Add "emergency call" button to CryptKeeper
This allows you to make an emergency call without needing to decrypt
your device first.
The exact appearance of the button, and the two possible icons shown to
the left of the text, are taken directly from the corresponding
framework resources (see keyguard_screen_*.xml, ic_emergency.png, and
stat_sys_phone_call.png.)
Also, the code in CryptKeeper.java for updating the state of, and
handling clicks from, the "Emergency call" button is mostly duplicated
from the corresponding code in LockPatternUtils and
LockPatternKeyguardView under frameworks/base.
Bug:
4494186
Change-Id: I36a713fdbc3281a7ba46762d47d5b61fb3cd194d
Dianne Hackborn [Fri, 24 Jun 2011 19:41:05 +0000 (12:41 -0700)]
am
e3cfa9bc: am
13bac39d: Remove obsolete compat mode UI.
* commit '
e3cfa9bc557e92d7a1b01270a405a9bd99700310':
Remove obsolete compat mode UI.
Dianne Hackborn [Fri, 24 Jun 2011 19:24:21 +0000 (12:24 -0700)]
am
13bac39d: Remove obsolete compat mode UI.
* commit '
13bac39d2120a82b8a22b52f0db0727aa04b1f38':
Remove obsolete compat mode UI.
Jason parks [Fri, 24 Jun 2011 19:05:12 +0000 (14:05 -0500)]
Check to see if the power source is a valid charger.
This will allow for devices that can be powered
over USB to be encrypted while plugged into USB.
Bug:
4901080
Change-Id: I7eaa2146c1c4e4dfc9724b11a08ff13a16eda117
Dianne Hackborn [Fri, 24 Jun 2011 17:47:47 +0000 (10:47 -0700)]
Merge "Add "large text" accessibility option."
The Android Open Source Project [Fri, 24 Jun 2011 15:08:51 +0000 (08:08 -0700)]
Reconcile with gingerbread-release
Change-Id: I5c53acce972848ec4adb67782e9e741b3555654b
Jeff Sharkey [Fri, 24 Jun 2011 05:15:54 +0000 (22:15 -0700)]
More data usage chart iteration, app details.
Moved app details back into single Fragment to support animations and
template tabs. Show the network in background behind app details
chart series to match designs.
Clamping sweeps at axis boundaries.
Bug:
4813014,
4598460,
4818029
Change-Id: I72c0b21ee1d595e4da31d293ae0dab9e801041f3
Jeff Sharkey [Fri, 24 Jun 2011 00:42:41 +0000 (17:42 -0700)]
Resize data usage assets.
Change-Id: If133332b9fd25698fcd94a67bc357052ca19e3c3
Dianne Hackborn [Fri, 24 Jun 2011 00:04:06 +0000 (17:04 -0700)]
Remove obsolete compat mode UI.
Change-Id: Ie16f70af4b8d6f33db21363a478049659669e0b3
Dianne Hackborn [Thu, 23 Jun 2011 23:35:55 +0000 (16:35 -0700)]
Add "large text" accessibility option.
Also re-arrange the UI a bit to clearly put the button for
enabling/disabiling accessibility services along-side said
services.
Change-Id: Ica1ddecddf6e97800909ba6bea9ce4e124b59c01
Justin Ho [Thu, 23 Jun 2011 22:27:10 +0000 (15:27 -0700)]
Merge "Turn off hardware acceleration to avoid crashes due to driver."
Amith Yamasani [Thu, 23 Jun 2011 22:24:06 +0000 (15:24 -0700)]
Turn off hardware acceleration to avoid crashes due to driver.
TODO: Turn this back on when driver bug is fixed.
Bug:
4883047
Change-Id: I8efb6d77035595650fff8acb8ddbd95a93fc711c
Gilles Debunne [Thu, 23 Jun 2011 19:57:17 +0000 (12:57 -0700)]
Merge "Refactoring in Settings/Applications"
Gilles Debunne [Thu, 23 Jun 2011 17:47:15 +0000 (10:47 -0700)]
Merge "Bug
4879032: NPE fix when restarting Settings."
Jaikumar Ganesh [Thu, 23 Jun 2011 14:48:24 +0000 (07:48 -0700)]
am
45679d94: (-s ours) am
38ae9125: (-s ours) am
7ab66973: Merge "DO NOT MERGE Show user dialog for BT." into gingerbread
* commit '
45679d942fa47b947b4ce7b45b82998b2972928d':
DO NOT MERGE Show user dialog for BT.
Jaikumar Ganesh [Thu, 23 Jun 2011 14:40:38 +0000 (07:40 -0700)]
am
47504c7b: am
a7bb204a: am
c6f14410: Merge "Remove CHAR LIMIT from string to fix build." into gingerbread
* commit '
47504c7b93823a7e5a0e0b4d9b0ca8f5093f79f9':
Remove CHAR LIMIT from string to fix build.
Jeff Sharkey [Thu, 23 Jun 2011 07:39:38 +0000 (00:39 -0700)]
Iterate on data usage chart UI.
Switched to inflating chart views from XML, using attributes for
configuration. Start using drawable assets for chart components
instead of manually painting. Include hand-cut assets, and animate
between states when touched to invoke.
Clamp sweeps to valid chart ranges and prepare for sweep labels.
Bug:
4768483,
4598460
Change-Id: Ic660c35bec826eb5e3f6a1dde3cc04d8c437ef2b
Adam Powell [Thu, 23 Jun 2011 04:11:01 +0000 (21:11 -0700)]
Merge "Fix build."
Adam Powell [Thu, 23 Jun 2011 04:09:31 +0000 (21:09 -0700)]
Fix build.
Change-Id: I766022f4b4224253bd6bc54427b8b2dd482685e1
Kenny Root [Thu, 23 Jun 2011 03:55:58 +0000 (20:55 -0700)]
Merge "Change dummy calendar setting during locale change"
Jaikumar Ganesh [Thu, 23 Jun 2011 03:31:14 +0000 (20:31 -0700)]
am
87c04ba6: am
f3670df2: am
2c85966d: Merge "New strings for Bluetooth" into gingerbread
* commit '
87c04ba668ed856ec61326e90c1fade980d4e893':
New strings for Bluetooth