OSDN Git Service
Ying Wang [Wed, 27 Jun 2012 23:19:29 +0000 (16:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5c769ea97c25696684c6818bfb84c95d30689b22
Jake Hamby [Mon, 25 Jun 2012 23:19:23 +0000 (16:19 -0700)]
Merge "Add menu item to Settings to go to Cell Broadcast settings." into jb-dev
Jake Hamby [Thu, 21 Jun 2012 17:59:22 +0000 (10:59 -0700)]
Add menu item to Settings to go to Cell Broadcast settings.
Add menu item to Settings when "config_cellBroadcastAppLinks"
config option is set to true to jump to the Cell Broadcast app
settings activity. This enables the Cell Broadcast launcher
icon to be removed, while still allowing access to the app
(by adding a similar menu item to the MMS app) and its settings
activity (this settings link).
The menu item will not be added if the CellBroadcastReceiver
package is disabled or not installed.
Bug:
6709985
Change-Id: If3a3016ceea70704790964c0b712c31cb38f7b62
Eric Fischer [Mon, 25 Jun 2012 20:00:04 +0000 (13:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic94e1bba24f847df6b65c46539bb2de12e8ab38b
Ying Wang [Fri, 22 Jun 2012 22:07:41 +0000 (15:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I417b1bbfd809569e110d5534fb2db1dd2c82075e
Eric Fischer [Thu, 21 Jun 2012 22:04:08 +0000 (15:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I77226bb57376204d2b55012c3be037a6f05be228
Eric Fischer [Thu, 21 Jun 2012 04:12:09 +0000 (21:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8d15ef5cb523bdc7f68216a7d465dcb7b9152477
Amith Yamasani [Wed, 20 Jun 2012 22:45:05 +0000 (15:45 -0700)]
Merge "Fix incorrect updating of headers in Settings" into jb-dev
Ying Wang [Wed, 20 Jun 2012 20:54:32 +0000 (13:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7d2055b0cf38cf4b676a599fd0c952b2fdac99b1
Amith Yamasani [Wed, 20 Jun 2012 20:51:40 +0000 (13:51 -0700)]
Fix incorrect updating of headers in Settings
Settings was overriding the header list in PreferenceActivity and
maintaining its own. In the case where Settings activity is restored
from saved state, the header lists went out of sync and couldn't
be updated anymore.
This makes use of a new private method in PreferenceActivity to
retrieve the header list object so that they stay in sync and can
be updated.
Also make sure to invalidate headers on resume, so that the latest
account types are loaded.
Bug:
6685701
Change-Id: I76ed1e1579a70fb5abfcea417d7e981907bdc02c
Christopher Tate [Tue, 19 Jun 2012 23:31:11 +0000 (16:31 -0700)]
Merge "Use string resources instead of literals for backup password confirmations" into jb-dev
Eric Fischer [Tue, 19 Jun 2012 23:23:23 +0000 (16:23 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Christopher Tate [Tue, 19 Jun 2012 22:44:15 +0000 (15:44 -0700)]
Use string resources instead of literals for backup password confirmations
Localizability is good. Bug
6683158
Change-Id: I205e4a09f5137e18d4085fcc041fae86f26ab188
Eric Fischer [Tue, 19 Jun 2012 23:01:49 +0000 (16:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I097248fa64ec4f5d75ca4ddda3a17d49c29647a7
Amith Yamasani [Tue, 19 Jun 2012 22:59:48 +0000 (15:59 -0700)]
Merge "Show full summary for network location sercice even for wifi-only devices" into jb-dev
Amith Yamasani [Tue, 19 Jun 2012 17:53:49 +0000 (10:53 -0700)]
Show full summary for network location sercice even for wifi-only devices
Bug:
6694051
Change-Id: Ic2446aa640bc2688fd74885eeb55f179c51e7691
Ying Wang [Mon, 18 Jun 2012 21:51:26 +0000 (14:51 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Ying Wang [Mon, 18 Jun 2012 21:40:20 +0000 (14:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8ba16c5a7895850d429ae355bf2c27e384bb248e
Jim Miller [Mon, 18 Jun 2012 20:19:42 +0000 (13:19 -0700)]
Merge "Fix
6663465: remove flagNoEnterAction in favor of actionNext" into jb-dev
Jim Miller [Sat, 16 Jun 2012 00:56:49 +0000 (17:56 -0700)]
Fix
6663465: remove flagNoEnterAction in favor of actionNext
This fixes a bug where the return key was showing in some layouts
for choose/confirm password screens in Settings. Now we just use
"actionNext" which ensures we see consistent behavior across
devices.
Change-Id: I4bf3033654b85f14c55de6f418caaf1ce563c33a
Dianne Hackborn [Sat, 16 Jun 2012 00:53:40 +0000 (17:53 -0700)]
Merge "Implement issue #
6633077: Improve permissions display for..." into jb-dev
Dianne Hackborn [Sat, 16 Jun 2012 00:23:55 +0000 (17:23 -0700)]
Merge "Fix issue #
6664140: Time to lock should work even Stay awake..." into jb-dev
Dianne Hackborn [Sat, 16 Jun 2012 00:07:14 +0000 (17:07 -0700)]
Fix issue #
6664140: Time to lock should work even Stay awake...
...in Developer options is on
Disable the stay awake while on option in settings if a lock limit
is being enforced.
Bug:
6664140
Change-Id: I8da1b8c734ceef10662d33392609c35e645315c3
Ying Wang [Fri, 15 Jun 2012 21:33:14 +0000 (14:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I861590828a57951c72001e0c6c6ab2222be320c8
Dianne Hackborn [Fri, 15 Jun 2012 18:00:17 +0000 (11:00 -0700)]
Implement issue #
6633077: Improve permissions display for...
...inherited permissions from shared UIDs
Bug:
6633077
Change-Id: I91917339e83b79a3dfcfcb70a68d571c9a7f7e14
Eric Fischer [Thu, 14 Jun 2012 20:44:39 +0000 (13:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ife956408e146ad876b860968dacd8f3095ed84e1
Amith Yamasani [Wed, 13 Jun 2012 22:21:29 +0000 (15:21 -0700)]
Merge "Show only the language if there's only one locale for the language." into jb-dev
Eric Fischer [Wed, 13 Jun 2012 21:17:44 +0000 (14:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8566dbced26846ce55861b5f57f95034d03604c2
Amith Yamasani [Wed, 13 Jun 2012 03:06:55 +0000 (20:06 -0700)]
Show only the language if there's only one locale for the language.
If the system has only one instance of that language, then only show the language
without the country name.
Bug:
6522572
Change-Id: I1e99182b1c669b200090f6c360bb902376b63ab0
Jeff Sharkey [Wed, 13 Jun 2012 00:13:12 +0000 (17:13 -0700)]
Storage banner when device in low disk state.
Bug:
6576409
Change-Id: I25f71935e312bf6efa832d10c22e3edbdc18f4fb
Ying Wang [Tue, 12 Jun 2012 22:24:15 +0000 (15:24 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Ying Wang [Tue, 12 Jun 2012 22:21:39 +0000 (15:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3f7c3cd191375024cd5613b3d2b8e0c859c96928
Russell Brenner [Tue, 12 Jun 2012 20:53:31 +0000 (13:53 -0700)]
Merge "Disable notification alerts in Settings for SUW" into jb-dev
Jeff Brown [Tue, 12 Jun 2012 19:57:11 +0000 (12:57 -0700)]
Fix NPE in rotation lock content observer.
Bug:
6647846
Change-Id: Idd17edb78f451807eabdd988017b68ce02b9c75f
Russell Brenner [Thu, 7 Jun 2012 22:37:04 +0000 (15:37 -0700)]
Disable notification alerts in Settings for SUW
When activated by Setup Wizard, disable notification alerts and other
status bar flags as also done by Setup Wizard and GSF.
Bug:
6645469
Change-Id: I43ef5c2a5fa3f53434a1aaa968de50d91b0d78ce
Eric Fischer [Mon, 11 Jun 2012 20:24:05 +0000 (13:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I835b15b3d3081d5d9010ff91eb54b9cd6e6316bb
Amith Yamasani [Fri, 8 Jun 2012 22:27:32 +0000 (15:27 -0700)]
Merge "Exit to Settings when removing the only account for a type." into jb-dev
Amith Yamasani [Fri, 8 Jun 2012 20:35:47 +0000 (13:35 -0700)]
Exit to Settings when removing the only account for a type.
Skip over the ManageAccounts screen which shows the list of accounts
for a particular type, if there are no accounts there.
Bug:
6630827
Also fix text alignment in top-level of settings.
Change-Id: Icd446babc131e7052fc9e95514214fffe6e6e113
Eric Fischer [Fri, 8 Jun 2012 22:10:38 +0000 (15:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8964ab48dade7424b2957d1f7ec7f2d8b9fb0ae0
Eric Fischer [Fri, 8 Jun 2012 22:06:30 +0000 (15:06 -0700)]
Add ID to copy translation from to string that is not translated yet.
Change-Id: If2fcdeb8ea6fb10a5abb04f3f5e654c03332bd2e
Danielle Millett [Fri, 8 Jun 2012 21:18:05 +0000 (14:18 -0700)]
Merge "Removing head turn and putting blink back" into jb-dev
Danielle Millett [Wed, 6 Jun 2012 17:54:11 +0000 (13:54 -0400)]
Removing head turn and putting blink back
Changing the strings and workflow in settings to be blink again
instead of the new head turn. This basically undoes the following
two cls: I67c8acd4 and Ifc7b6e18.
Change-Id: I8694b1d82efac9d2f97c29128da6698b6ac2a4ce
Amith Yamasani [Fri, 8 Jun 2012 07:04:11 +0000 (00:04 -0700)]
Merge "Save the auto-sync dialog state for orientation changes" into jb-dev
Amith Yamasani [Fri, 8 Jun 2012 02:58:34 +0000 (19:58 -0700)]
Save the auto-sync dialog state for orientation changes
Bug:
6630421
Change-Id: I11447173483da499e23c5ce41c566fa988385e6b
Amith Yamasani [Fri, 8 Jun 2012 02:18:50 +0000 (19:18 -0700)]
Merge "Directly go to account sync screen if there's only one account for that type." into jb-dev
Amith Yamasani [Fri, 8 Jun 2012 00:03:20 +0000 (17:03 -0700)]
Directly go to account sync screen if there's only one account for that type.
Bug:
6629330
Change-Id: Ieb2bad131b1580a6b75d970c9a0ea9980580f66d
Eric Fischer [Thu, 7 Jun 2012 22:12:24 +0000 (15:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5c5f75c4980677fef82c64d83f3d7a37ae604cc3
Amith Yamasani [Thu, 7 Jun 2012 18:06:10 +0000 (11:06 -0700)]
Merge "Add back a SYNC_SETTINGS screen" into jb-dev
Amith Yamasani [Thu, 7 Jun 2012 03:23:08 +0000 (20:23 -0700)]
Add back a SYNC_SETTINGS screen
Revive the old Accounts&Sync screen as a dialog with the auto-sync
checkbox and a list of accounts. This will be launched when Apps
request a SYNC_SETTINGS page for controlling account and master sync.
Auto-sync data checkbox will also continue to exist in Data Usage.
Minor fixes to account list and account update monitoring.
Bug:
6614013
Bug:
6622995
Bug:
6610247
Change-Id: I35c0919a29c6bc7e5edf64f2734a3ef4f5ae5e7a
Philip Milne [Thu, 7 Jun 2012 00:34:39 +0000 (17:34 -0700)]
Merge "Fix
6622557: Developer options "Show layout bounds" summary should say "margins" instead of "padding"" into jb-dev
Philip Milne [Wed, 6 Jun 2012 21:41:28 +0000 (14:41 -0700)]
Fix
6622557: Developer options "Show layout bounds" summary should say "margins" instead of "padding"
Change-Id: I702b0d86c33b49854df5a65b398891183c3212cf
Eric Fischer [Wed, 6 Jun 2012 20:21:25 +0000 (13:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: If466dfc20ff28bfb26b10214503200452c66ccea
Jeff Brown [Wed, 6 Jun 2012 02:11:42 +0000 (19:11 -0700)]
Merge "Implement new rotation policy." into jb-dev
Jeff Brown [Wed, 6 Jun 2012 02:11:37 +0000 (19:11 -0700)]
Merge "Revert "Settings: "Rotation lock" retains existing orientation."" into jb-dev
Jeff Brown [Wed, 6 Jun 2012 02:11:32 +0000 (19:11 -0700)]
Merge "Revert "Rename and flip meaning of auto-rotate to rotation lock."" into jb-dev
Jeff Brown [Wed, 6 Jun 2012 00:49:24 +0000 (17:49 -0700)]
Implement new rotation policy.
Show "auto-rotate screen" option in Display only if the Rotation Lock
feature is not available on the device.
When the "auto-rotate screen" option is disabled in Accessibility or
Display settings, hide the Rotation Lock feature.
Use new RotationPolicy class to adjust rotation settings.
Bug:
6523269
Change-Id: Ifa89ff055e5ad0a00888e10720dd76b0054fe290
Jeff Brown [Mon, 4 Jun 2012 22:40:31 +0000 (15:40 -0700)]
Revert "Settings: "Rotation lock" retains existing orientation."
Bug:
6523269
This reverts commit
523d5a6e0495580206ee38e5072e5aef8063e806.
Jeff Brown [Mon, 4 Jun 2012 22:37:57 +0000 (15:37 -0700)]
Revert "Rename and flip meaning of auto-rotate to rotation lock."
Bug:
6523269
This reverts commit
b94417109279fb7d27f0b27c97e76860ed6446ba.
Justin Ho [Tue, 5 Jun 2012 22:03:54 +0000 (15:03 -0700)]
Merge "Update headers when accounts are changed." into jb-dev
Andrew Flynn [Tue, 29 May 2012 19:36:50 +0000 (12:36 -0700)]
Increase dimens for power control widget for sw600dp
Bug:
6527125
Change-Id: If4c3dad24e8fc70ca76bb551cfd9e32be96a6337
Amith Yamasani [Tue, 5 Jun 2012 20:20:45 +0000 (13:20 -0700)]
Update headers when accounts are changed.
Also pass an account to authenticator settings to avoid Email settings crash.
Bug:
6610990
Change-Id: I42884619728dd97446de65cc77e1729f3e143efa
Eric Fischer [Tue, 5 Jun 2012 19:03:44 +0000 (12:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I81581e50f658f628a5d6354c9c8372cc1a98d566
Eric Fischer [Tue, 5 Jun 2012 01:21:44 +0000 (18:21 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Tue, 5 Jun 2012 01:19:13 +0000 (18:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3347ec085b2a09f654b17c0609522d47a14627b2
Amith Yamasani [Tue, 5 Jun 2012 01:02:34 +0000 (18:02 -0700)]
Merge "Account types at toplevel of Settings" into jb-dev
Amith Yamasani [Fri, 18 May 2012 16:50:08 +0000 (09:50 -0700)]
Account types at toplevel of Settings
Reorganized Account settings to show account types at the top-level
of Settings. Only account types that have accounts added are visible
here. There is an Add account button to add a new account.
Master sync toggle has moved to Data Usage screen in the overflow menu.
It shows additional detail of the function of the auto-sync toggle when
it is toggled by the user.
Account type screen (ManageAccountsSettings) shows list of accounts of
that type and any available authenticator settings. It additionally
verifies any Intents can be resolved before showing the corresponding
entry. This screen now shows last synced time for each account.
You can now sync all accounts of a type by selecting Sync now in the
Account type screen.
Account Sync screen that shows the list of syncable items has minor
tweaks:
- "Last synced...", "Sync is OFF"
- Doesn't show the authenticator settings here anymore.
Bug:
6579937
Change-Id: I8139a4c992b525a3e1efc24d2d223c3f5caddc76
Dianne Hackborn [Mon, 4 Jun 2012 22:32:54 +0000 (15:32 -0700)]
Fix issue #
6603152: User-adjustable autobrightness broken?
Two issues:
- The new brightness was not being applied when switching out
of auto-brightness mode.
- We were resetting to the last brightness level when switching
modes. This is because at that point we read the current
brightness setting, but that isn't changed as the user adjusts
only when the final value is committed. To fix this, we have
a new local variable keeping track of the last brightness value
we have shown and use that when we haven't committed the
brightness to settings.
Change-Id: I7cc02c9f90128eacec427587a3f6b8f25ede4bd3
Irfan Sheriff [Mon, 4 Jun 2012 18:55:45 +0000 (11:55 -0700)]
Merge "Fix crash when accessibility is on" into jb-dev
Irfan Sheriff [Mon, 4 Jun 2012 17:21:11 +0000 (10:21 -0700)]
Fix crash when accessibility is on
Bug:
6600699
Change-Id: I9eb8b9871d1368bd7508873951d5719e1f2ba826
Eric Fischer [Sat, 2 Jun 2012 01:10:52 +0000 (18:10 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Brian Colonna [Fri, 1 Jun 2012 21:45:56 +0000 (14:45 -0700)]
Merge "Bug
5457035: Changed strings in FUL anti-spoofing setup" into jb-dev
Brian Colonna [Fri, 1 Jun 2012 20:37:06 +0000 (16:37 -0400)]
Bug
5457035: Changed strings in FUL anti-spoofing setup
Added latest string changes requested for Face Unlock
liveness/head-turn anti-spoofing option.
Change-Id: Ic703bda6b449756bdf05d7de843e9aab6b939446
Eric Fischer [Fri, 1 Jun 2012 19:28:50 +0000 (12:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id95cfc21f742d95cdb4b8ca7530c4410faaaba63
Eric Fischer [Thu, 31 May 2012 22:48:12 +0000 (15:48 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Amith Yamasani [Thu, 31 May 2012 22:27:19 +0000 (15:27 -0700)]
Merge "Reword the summary text for Unknown sources in Security Settings" into jb-dev
Irfan Sheriff [Thu, 31 May 2012 22:04:53 +0000 (15:04 -0700)]
Merge "Fetch peers after preferenceScreen is ready" into jb-dev
Eric Fischer [Thu, 31 May 2012 21:28:01 +0000 (14:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I508ef274b0aa63d2505a2db40534697b6b266666
Amith Yamasani [Thu, 31 May 2012 20:12:13 +0000 (13:12 -0700)]
Reword the summary text for Unknown sources in Security Settings
Don't use "non-Market" to describe unknown sources.
Bug:
6586626
Change-Id: I2ab440e9db1592ea8b398bd9466ff2f05ca5f6ce
Irfan Sheriff [Thu, 31 May 2012 19:42:25 +0000 (12:42 -0700)]
Fetch peers after preferenceScreen is ready
Bug:
6450152
Change-Id: Ic95c7fdba5fa7cb54b0c54ed9a423e0e0683ad2f
Irfan Sheriff [Thu, 31 May 2012 19:22:30 +0000 (12:22 -0700)]
Merge "Fix poor network detection setting" into jb-dev
Irfan Sheriff [Thu, 31 May 2012 18:15:41 +0000 (11:15 -0700)]
Fix poor network detection setting
We used to base this on watchdog being turned on, but it should
be based on whether device is wifi only
Bug:
6576101
Change-Id: Ib5221287e6713c625d39ef986ceb278825fb4895
Uriel Rodriguez [Thu, 31 May 2012 15:44:09 +0000 (08:44 -0700)]
Merge "BUG
5457035 : Anti-spoofing : DO NOT MERGE" into jb-dev
satok [Thu, 31 May 2012 14:43:37 +0000 (23:43 +0900)]
Do not show security warning for the system IMEs
Bug:
6587127
Change-Id: I00584fb81cf5b39806c30a801b215a0e9a1e9399
Uriel Rodriguez [Wed, 30 May 2012 23:55:12 +0000 (19:55 -0400)]
BUG
5457035 : Anti-spoofing : DO NOT MERGE
Squashed commit of the following:
commit
060b9daf5fe3c45573a13a149bf98f4fa1e6a46f
Author: Danielle Millett <dmillett@google.com>
Date: Wed May 30 15:50:03 2012 -0400
Added head turn option for Face Unlock.
In security settings there is an option for head turn and it shows the current
status (on/off). Clicking on this goes to another screen that describes the
feature and allows the user to it on/off.
Since the head turn option goes to a different screen instead of using a check box,
this change also rips out the rest of the code for the old liveliness checkbox.
Change-Id: I197af51084f3e751081fa159dadd6c2c80840d1e
Change-Id: I67c8acd49316b49771a0bb97b4a5fbd5a1c13262
Jeff Brown [Wed, 30 May 2012 22:00:50 +0000 (15:00 -0700)]
Merge "Fix comparison of device source bits." into jb-dev
Jeff Brown [Wed, 30 May 2012 21:33:16 +0000 (14:33 -0700)]
Fix comparison of device source bits.
Bug:
6576743
Change-Id: I123307defc32a84a965590fbded95c6997260675
Eric Fischer [Wed, 30 May 2012 20:50:22 +0000 (13:50 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Wed, 30 May 2012 20:37:01 +0000 (13:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I45c903dfad7e0b599f9b29b3c4f472d3daf9b25d
Amith Yamasani [Wed, 30 May 2012 16:55:45 +0000 (09:55 -0700)]
Merge "Adjust layout to avoid clipping." into jb-dev
Svetoslav Ganov [Wed, 30 May 2012 03:02:50 +0000 (20:02 -0700)]
Merge "Lock screen rotation accessibility preference not updated." into jb-dev
Dianne Hackborn [Wed, 30 May 2012 02:09:45 +0000 (19:09 -0700)]
Merge "Fix issue where Manage Apps would not start on correct page." into jb-dev
Jeff Brown [Wed, 30 May 2012 01:05:35 +0000 (18:05 -0700)]
Merge "Make string bigger for localization." into jb-dev
Svetoslav Ganov [Wed, 30 May 2012 00:36:48 +0000 (17:36 -0700)]
Lock screen rotation accessibility preference not updated.
1. If the lock screen rotation preference is changed from the
status bar the checkbox in the accessibility settings was
not updated.
bug:
6562028
Change-Id: I353e3ad59374ad207297d2a6682e50ed07df820c
Jeff Brown [Wed, 30 May 2012 00:26:27 +0000 (17:26 -0700)]
Make string bigger for localization.
Bug:
6575551
Change-Id: Ia13043325bc9fe28e36a0047dba5313900ab91d2
Dianne Hackborn [Wed, 30 May 2012 00:21:05 +0000 (17:21 -0700)]
Fix issue where Manage Apps would not start on correct page.
We weren't setting the correct initial page in the view
pager.
Change-Id: I68846505a4f23547e9b09e4bc06e3d455ae9556f
Amith Yamasani [Tue, 29 May 2012 22:49:29 +0000 (15:49 -0700)]
Adjust layout to avoid clipping.
Fixes the WiFi AP dialogs getting clipped at the right edge.
Bug:
6525128
Change-Id: Ic1c5c682d51e1492fe3c739c01255db886a90518
Jeff Sharkey [Tue, 29 May 2012 22:01:33 +0000 (15:01 -0700)]
Merge "Surface metered networks as "Mobile hotspots."" into jb-dev
Eric Fischer [Tue, 29 May 2012 21:34:03 +0000 (14:34 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Tue, 29 May 2012 21:15:59 +0000 (14:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I46077aeea1d55b35eddd45138c09d25bf3df4aa6
Amith Yamasani [Tue, 29 May 2012 21:13:50 +0000 (14:13 -0700)]
Merge "Retain text in Rename Device dialog." into jb-dev