OSDN Git Service
Robin Lee [Fri, 19 Jun 2015 20:03:05 +0000 (20:03 +0000)]
Merge "Only unregister the network callback at onPause" into mnc-dev
Jason Monk [Fri, 19 Jun 2015 15:22:20 +0000 (15:22 +0000)]
Merge "Add content description to owner info status text" into mnc-dev
Jason Monk [Fri, 19 Jun 2015 15:17:03 +0000 (11:17 -0400)]
Add content description to owner info status text
Bug:
21799551
Change-Id: I8fe82d304309949a5a46492f7d20c58e006baea3
John Spurlock [Fri, 19 Jun 2015 14:55:10 +0000 (14:55 +0000)]
Merge "Settings: Add widget entry point to magical entry points listing." into mnc-dev
John Spurlock [Fri, 19 Jun 2015 14:47:36 +0000 (10:47 -0400)]
Settings: Add widget entry point to magical entry points listing.
Bug:
21930077
Change-Id: I67b05d6064a2ab0fe93d3d8841c9f23c9246a101
Brian Carlstrom [Fri, 19 Jun 2015 04:23:07 +0000 (04:23 +0000)]
Merge "Clarify process_dex2oat_label description" into mnc-dev
Sanket Padawe [Fri, 19 Jun 2015 01:39:25 +0000 (18:39 -0700)]
Increase char limit of the data usage Settings string to 33.
Bug:
21801556
Change-Id: I82d99f155a3c4b6f1ac0f3056c254e54b8e5f311
Jason Monk [Thu, 18 Jun 2015 20:07:40 +0000 (20:07 +0000)]
Merge "Fix ListView being too eager too scroll" into mnc-dev
Jason Monk [Thu, 18 Jun 2015 19:56:21 +0000 (15:56 -0400)]
Fix ListView being too eager too scroll
ListView is always too eager to scroll, so just stop using it.
Bug:
21853796
Change-Id: Id37d89b0312597a9fb65a33f151af34b3f395d91
Jason Monk [Thu, 18 Jun 2015 19:19:08 +0000 (19:19 +0000)]
Merge "Fix opening secured networks from QS" into mnc-dev
Brian Carlstrom [Thu, 18 Jun 2015 17:11:18 +0000 (10:11 -0700)]
Clarify process_dex2oat_label description
Bug:
21898104
Change-Id: I264f784db761ac51a1dde51f189fb017b7d378b1
Alex Chau [Thu, 18 Jun 2015 17:10:34 +0000 (17:10 +0000)]
Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev
Jason Monk [Thu, 18 Jun 2015 16:36:34 +0000 (12:36 -0400)]
Fix opening secured networks from QS
Bug:
21908788
Change-Id: I09b1d22ae8b1815e720bd8c05fa1e38d66d1dcfd
Jason Monk [Thu, 18 Jun 2015 15:54:55 +0000 (15:54 +0000)]
Merge "Revert "Accounts -> Account sync"" into mnc-dev
Jason Monk [Thu, 18 Jun 2015 15:44:25 +0000 (15:44 +0000)]
Revert "Accounts -> Account sync"
This reverts commit
43db745ea0bdb3f8cb2737e74ffcad1d381b4a2b.
Bug:
21726868
Change-Id: I72fd09c493f71a607b9df8eaa8e42047a60303e8
Jason Monk [Thu, 18 Jun 2015 15:31:22 +0000 (15:31 +0000)]
Merge "Remove battery history graph from details screen" into mnc-dev
Jason Monk [Thu, 18 Jun 2015 15:06:18 +0000 (11:06 -0400)]
Remove battery history graph from details screen
Bug:
21854416
Change-Id: I3172106c8b1adbe19179adddcec2848d14d04588
Alex Chau [Fri, 12 Jun 2015 10:45:08 +0000 (11:45 +0100)]
Enforce Keyguard policy in Notification Settings
- Applied getKeyguardDisabledFeatures for notification settings and
notification setup page (after settings a screenlock)
- If a notification settings is disabled, the next least secure setting
will be chosen
- Although KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS can be set be
profile, it will not be reflected in both settings page. This is
because it does not affect the owner (user 0), as mentioned in
DevicePolicyManagerService.PROFILE_KEYGUARD_FEATURES_AFFECT_OWNER
- Skip RedactionInterstitial if there is <= 1 options for the user
- Tested with both Setup wizard and settings case, both pattern and
password, as well as toggling the policy on and off
Bug:
19307118
Bug:
17099898
Change-Id: If640d5576caa0163e9942569f7b4643a30bbfe0a
Jason Monk [Thu, 18 Jun 2015 14:36:39 +0000 (10:36 -0400)]
Allow give/take in app version/disabled fields
Switch to wrap_content so if one view is smaller, the other
can use its space.
Bug:
21901206
Change-Id: Ic69d2577c3291e6ed171caa0fa361ccc43eaf180
Robin Lee [Thu, 18 Jun 2015 01:43:59 +0000 (18:43 -0700)]
Only unregister the network callback at onPause
Bug:
21592804
Change-Id: I425a8ebd350125ae48b9cf44cfef0b4c572ec25e
Junda Liu [Wed, 17 Jun 2015 22:50:59 +0000 (22:50 +0000)]
Merge "Don't show SIM lock Setting if carrier config hides it." into mnc-dev
Junda Liu [Wed, 17 Jun 2015 17:15:34 +0000 (10:15 -0700)]
Don't show SIM lock Setting if carrier config hides it.
Bug: b/
19623656
Change-Id: Ic7420fe3579815a8c2c884a78b13112affb00787
Jason Monk [Wed, 17 Jun 2015 20:31:26 +0000 (20:31 +0000)]
Merge "Support disabled until used apps" into mnc-dev
Jason Monk [Wed, 17 Jun 2015 20:31:16 +0000 (20:31 +0000)]
Merge "Fix accessibility for empty list on notification access" into mnc-dev
Jason Monk [Wed, 17 Jun 2015 19:42:01 +0000 (15:42 -0400)]
Fix accessibility for empty list on notification access
Bug:
21797352
Change-Id: I6c68c9abb43c6dfcc8b0a4d07cfe0d4cede6e817
Makoto Onuki [Wed, 17 Jun 2015 17:46:49 +0000 (17:46 +0000)]
Merge "Don't crash on NameNotFoundException" into mnc-dev
Makoto Onuki [Wed, 17 Jun 2015 17:13:15 +0000 (10:13 -0700)]
Don't crash on NameNotFoundException
Just finish().
Bug
20672468
Change-Id: Ic600e060990b7e3bc3e98bda63d0f4c9e530fb94
Geoff Mendal [Wed, 17 Jun 2015 15:23:33 +0000 (15:23 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 17 Jun 2015 14:59:14 +0000 (07:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1ec85dbe877d7fae6edf1f93ec812bc7b1223daa
Auto-generated-cl: translation import
Jason Monk [Wed, 17 Jun 2015 13:17:31 +0000 (09:17 -0400)]
RIP -night DO NOT MERGE
Bug:
21854466
Change-Id: Ied1512cb1d8c80df9f6c990f8f91f82d7f140533
Jason Monk [Wed, 17 Jun 2015 13:01:27 +0000 (13:01 +0000)]
Merge "Guard against callbacks when no list view created" into mnc-dev
Jeff Sharkey [Wed, 17 Jun 2015 03:23:58 +0000 (03:23 +0000)]
Merge "Actually gracefully finish this time around." into mnc-dev
Jeff Sharkey [Wed, 17 Jun 2015 03:11:44 +0000 (20:11 -0700)]
Actually gracefully finish this time around.
Also fix tinting on front-door icon.
Bug:
21403958
Change-Id: I74f0372a41b92235abe10391f36d9f6a1e6a40c5
Jim Miller [Tue, 16 Jun 2015 23:59:36 +0000 (23:59 +0000)]
Merge "Fix issue with german translation of lock times" into mnc-dev
Jeff Sharkey [Tue, 16 Jun 2015 23:48:06 +0000 (23:48 +0000)]
Merge "Gracefully finish when missing volume." into mnc-dev
Jeff Sharkey [Tue, 16 Jun 2015 23:46:03 +0000 (16:46 -0700)]
Gracefully finish when missing volume.
Bug:
21403958
Change-Id: Icb78bb633842571c4df696c9db72a5b97ece0655
Jim Miller [Tue, 16 Jun 2015 23:21:27 +0000 (16:21 -0700)]
Fix issue with german translation of lock times
The word "immediately" would go into a different place in the sentence
than a number so we have to break this into two strings.
Fixes bug
21602326
Change-Id: Ie07f1bc84d68bdea8d6f1264dfd18326c2e48df4
Brian Carlstrom [Tue, 16 Jun 2015 22:59:03 +0000 (22:59 +0000)]
Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev
Jeff Sharkey [Tue, 16 Jun 2015 22:31:27 +0000 (22:31 +0000)]
Merge "Finish storage wizard theming." into mnc-dev
Jeff Sharkey [Tue, 16 Jun 2015 20:52:10 +0000 (13:52 -0700)]
Finish storage wizard theming.
Storage wizard screens now have updated assets from UX, and various
assets are tinted consistently. We're using our own navigation bar
and wholesale replacing the layout from upstream.
Fix text colors in night mode. Tell SystemUI when we're finished
with the wizard flow.
Bug:
21830731
Change-Id: Ic8d09cc152bfb4dcc6089b5c61d28cbdd4be3ee9
Makoto Onuki [Tue, 16 Jun 2015 22:27:08 +0000 (22:27 +0000)]
Merge "Allow formatting when a partition is corrupt." into mnc-dev
Makoto Onuki [Tue, 16 Jun 2015 17:40:44 +0000 (10:40 -0700)]
Allow formatting when a partition is corrupt.
Bug
21848166
Change-Id: Ied8efaa1320c49a01ae08f19461bf125b3ffa97f
Jason Monk [Tue, 16 Jun 2015 20:49:54 +0000 (20:49 +0000)]
Merge "Remove theme setting DO NOT MERGE" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 20:40:50 +0000 (16:40 -0400)]
Remove theme setting DO NOT MERGE
Because it's just too incredibly useful...
Bug:
21854466
Change-Id: I984cf709f484a220e9ba7738a8b9c166c28573b2
Jason Monk [Tue, 16 Jun 2015 20:36:45 +0000 (20:36 +0000)]
Merge "Update for shortcuts" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 19:00:41 +0000 (15:00 -0400)]
Update for shortcuts
Change-Id: If28d540fd9e300b9c26d5cb6869be3d475124e9e
Jason Monk [Tue, 16 Jun 2015 20:18:30 +0000 (16:18 -0400)]
Support disabled until used apps
Bug:
21782239
Change-Id: I59bef6689a9efb74f64827026add0cbddc18cf53
Yorke Lee [Tue, 16 Jun 2015 19:30:13 +0000 (19:30 +0000)]
Merge "Send broadcast when default dialer changes" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 19:26:40 +0000 (19:26 +0000)]
Merge "Don't show work apps in ignore optimizations list" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 19:11:41 +0000 (15:11 -0400)]
Guard against callbacks when no list view created
Bug:
21762925
Change-Id: If4bdaa6cf107c4b890a8ebeb56ba4ef222a340ad
Jason Monk [Tue, 16 Jun 2015 18:18:26 +0000 (14:18 -0400)]
Don't show work apps in ignore optimizations list
The setting is global, so we only ever need one of each app.
Bug:
21847753
Change-Id: Ib04061d87b9deb81a579ad110451f2f55ec7aeff
Jason Monk [Tue, 16 Jun 2015 16:46:46 +0000 (16:46 +0000)]
Merge "Add warning for disabling usage access on prof owners" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 13:10:00 +0000 (09:10 -0400)]
Add warning for disabling usage access on prof owners
Bug:
20751702
Change-Id: Id0f54f06c3bf05c32a973ad805c116cbae96028a
Sanket Padawe [Tue, 16 Jun 2015 15:24:04 +0000 (15:24 +0000)]
Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-dev
Jason Monk [Tue, 16 Jun 2015 14:31:38 +0000 (10:31 -0400)]
Start all help intents as startActivityForResult
So that the receiver may verify identity if they so desire...
Bug:
21849741
Change-Id: I2e2c3f674a8be88f22e051e2affb54df2f1c3eed
Jason Monk [Tue, 16 Jun 2015 13:17:01 +0000 (13:17 +0000)]
Merge "Layout refinement for app lists" into mnc-dev
Jason Monk [Fri, 12 Jun 2015 16:32:50 +0000 (12:32 -0400)]
Layout refinement for app lists
Make all app lists (or at least all current app lists) use the same
base layout for icon, label, and sizing/padding. This way they
should look the same.
Bug:
21727125
Bug:
21726922
Bug:
21853632
Change-Id: I3cffadb9e7b5184d4209deacd4ea70ec1d4f71b4
Jeff Sharkey [Fri, 20 Mar 2015 18:25:22 +0000 (11:25 -0700)]
Check new user restriction.
Change-Id: I8891a4347478c243a3f1a14cf8cdf9b4784c9fab
Jeff Sharkey [Tue, 16 Jun 2015 04:47:16 +0000 (04:47 +0000)]
Merge "More storage UI updates." into mnc-dev
Jeff Sharkey [Tue, 16 Jun 2015 04:08:56 +0000 (21:08 -0700)]
More storage UI updates.
Storage volumes now have headers with larger fonts and progress bars
to show used versus free space. Updated Memory to use new formatting
template, and Data Usage to use consistent display logic.
Allocate a unique color for each private volume, and yell when a
volume is running low on space. Update private volume details to
launch into MediaStore-backed storage backends in a management mode,
and only show detailed items when hosting emulated storage. Show
details dialog about "Other" and user storage items.
Shortcut into single private volume when it's the only device. Add
real eject icon.
Bug:
21756698,
20275574,
21326612
Change-Id: If3ecd1d912d3e709c09d3e4da24f368e04dd3f9d
Jim Miller [Tue, 16 Jun 2015 03:48:55 +0000 (03:48 +0000)]
Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev
Jim Miller [Tue, 16 Jun 2015 03:41:02 +0000 (20:41 -0700)]
Limit number of fingerprint templates that can be enrolled per device user
This change places an upper limit on the number of fingerprint templates that
can be enrolled per account. This is done primarily for performance reasons, but
may also be imposed by hardware and Trusted Execution Environment (TEE) reasons.
Fixes bug
20731847
Change-Id: I3975290fa8eb2106467493aab6102015697e012c
On branch max_fingerprint
Sean Francis-Lyon [Sat, 13 Jun 2015 00:46:41 +0000 (17:46 -0700)]
show old legal text in backup settings if full data backup is disabled
Change-Id: Ifc4fa5c4a6180fd4ceb41ca66dc2dd6a58f4f086
Adrian Roos [Mon, 15 Jun 2015 23:49:17 +0000 (23:49 +0000)]
Merge "Use AssistUtils.getAssistInfo" into mnc-dev
Adrian Roos [Mon, 15 Jun 2015 20:32:58 +0000 (13:32 -0700)]
Use AssistUtils.getAssistInfo
Use consistent logic with SystemUI for determining
default assist component.
Bug:
21780590
Change-Id: I1313b79ce3bb75944889e3ceccb4a2e6bb23e824
Amit Mahajan [Mon, 15 Jun 2015 22:16:35 +0000 (22:16 +0000)]
Merge "Change to trigger client initiated OMA-DM session on System update req." into mnc-dev
John Spurlock [Mon, 15 Jun 2015 19:36:45 +0000 (19:36 +0000)]
Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-dev
John Spurlock [Mon, 15 Jun 2015 19:24:16 +0000 (15:24 -0400)]
Settings: Remove unreachable "Battery Info" screen.
Bug:
21576824
Change-Id: Ia2bb3b22b7512cd05ceca5798e85e5479e064213
Yorke Lee [Mon, 15 Jun 2015 19:11:05 +0000 (12:11 -0700)]
Send broadcast when default dialer changes
Bug:
21846308
Change-Id: Ic92c3e39fa23dc1f2e08aa5d1dd1b27835c325cf
Dianne Hackborn [Sat, 13 Jun 2015 01:13:54 +0000 (18:13 -0700)]
Fix issue #
21813831: Need API for asking to be added to power whitelist
When launching the battery whitelist for a particular app, we now
default to the app being asked to enable adding to the whitelist, and
dismissing the dialog will dismiss the entire whitelist UI.
You can now launch the whitelist without specifying an app to just
get the regular UI.
Change-Id: Idf3840b8a30febe71fbd600969c257d72809643f
Geoff Mendal [Mon, 15 Jun 2015 15:36:59 +0000 (15:36 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Jason Monk [Mon, 15 Jun 2015 15:05:33 +0000 (15:05 +0000)]
Merge "Fix bad theming on owner-info" into mnc-dev
Jason Monk [Mon, 15 Jun 2015 14:58:50 +0000 (10:58 -0400)]
Fix bad theming on owner-info
Bug:
21784828
Change-Id: I18c7ef71efd9549ffb2207b66d04162cd32e35a5
Geoff Mendal [Mon, 15 Jun 2015 14:57:05 +0000 (07:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifda55ef8db028d95b618b0a44dbe4d2c3c212f44
Auto-generated-cl: translation import
Jason Monk [Mon, 15 Jun 2015 14:51:28 +0000 (14:51 +0000)]
Merge "Don't auto-focus text fields in hotspot dialog" into mnc-dev
Jason Monk [Mon, 15 Jun 2015 14:45:46 +0000 (10:45 -0400)]
Don't auto-focus text fields in hotspot dialog
Instead focus the parent, so that the fields can be seen on smaller
screens before editing.
Bug:
19095568
Change-Id: Ifeacce3ed64c370ff414e81bd4d25c5d0b26712c
Jason Monk [Mon, 15 Jun 2015 14:14:50 +0000 (14:14 +0000)]
Merge "Handle switch of ssid to CharSequence (for spans)" into mnc-dev
Jason Monk [Mon, 15 Jun 2015 14:08:40 +0000 (10:08 -0400)]
Handle switch of ssid to CharSequence (for spans)
Change to reference the string directly for places like search,
etc.
Bug:
20059794
Change-Id: I3305c9833e8aeea52b968c094d0a1881a3e6699e
Paul Jensen [Mon, 15 Jun 2015 13:36:57 +0000 (13:36 +0000)]
Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev
Jeff Sharkey [Mon, 15 Jun 2015 04:07:27 +0000 (21:07 -0700)]
New storage dialogs.
Show a helpful dialog when a volume is unmounted or unmountable, or
when disk is unsupported. Add both missing private volumes and
unsupported disks in the storage list. Dialog to confirm when
forgetting private volume.
Finish volume detail activities when the volume becomes unmounted.
Show used space instead of free space to match string. When init'ing
a volume on non-adoptable disk, just format as public.
Bug:
21737573,
21666225,
21737666,
21471429
Change-Id: Id60d5a398e2b7923ebebdc5cfaef33248d8d77bb
Brian Carlstrom [Sat, 13 Jun 2015 03:54:16 +0000 (20:54 -0700)]
dex2oat should show something friendlier in Settings -> Battery
Bug:
13161823
Change-Id: If68d91900c88f33f5656a9e336633d53a5e900ce
Nick Kralevich [Sat, 13 Jun 2015 03:12:25 +0000 (03:12 +0000)]
Merge "Let UsbDeviceManager choose the appropriate function default" into mnc-dev
Nick Kralevich [Sat, 13 Jun 2015 03:12:07 +0000 (03:12 +0000)]
Merge "Fix bad USB configuration under Developer Options" into mnc-dev
Sanket Padawe [Sat, 13 Jun 2015 01:09:45 +0000 (18:09 -0700)]
Add PBAP checkbox for BT pairing consent dialog.
Bug:
20488109
Change-Id: Ib6c98c27e6d2b8e59fa4b640df15214a6b197853
Nick Kralevich [Sat, 13 Jun 2015 00:16:32 +0000 (17:16 -0700)]
Let UsbDeviceManager choose the appropriate function default
Rather than hardcoding MTP as the appropriate default when the user
selects "Charger Only", call UsbDeviceManager.setCurrentFunction(null).
Null is intended to restore the default function, which is appropriate
for charging only.
Bug:
21429947
Change-Id: I9ee633bcf2f95f9937861c234ab044873202d41b
Makoto Onuki [Fri, 12 Jun 2015 23:57:53 +0000 (23:57 +0000)]
Merge "Add simple null checks to StorageWizard*, also listen to..." into mnc-dev
Nick Kralevich [Fri, 12 Jun 2015 23:30:45 +0000 (16:30 -0700)]
Fix bad USB configuration under Developer Options
The USB configuration screen under Developer Options hasn't been
updated for the new USB access control changes. Update it.
1) Ensure that the default in Development Settings is "Charger Only".
2) Changing USB mode in developer settings only changes the USB function.
It doesn't unlock any USB data.
Bug:
21258972
Change-Id: I9cbd5099cb55f31f1258e512e5ee7f6f4e303fc9
Makoto Onuki [Thu, 11 Jun 2015 23:16:22 +0000 (16:16 -0700)]
Add simple null checks to StorageWizard*, also listen to...
the disk destroyed event.
Bug
21336042
Change-Id: I9f53501a6122a4a9046774e3c4c08b5d6d6f8552
Selim Cinek [Fri, 12 Jun 2015 21:57:44 +0000 (21:57 +0000)]
Merge "Added an introduction to the fingerprint enrollment" into mnc-dev
Makoto Onuki [Fri, 12 Jun 2015 16:18:30 +0000 (16:18 +0000)]
Merge "Promote "add service" from menu to list item" into mnc-dev
Rubin Xu [Fri, 12 Jun 2015 16:18:15 +0000 (16:18 +0000)]
Merge "Defensively load untrusted icons from account authenticator" into mnc-dev
Kenny Guy [Fri, 12 Jun 2015 15:11:27 +0000 (15:11 +0000)]
Merge "Remove incorrect TODO and meta-data." into mnc-dev
Kenny Guy [Fri, 12 Jun 2015 14:45:19 +0000 (15:45 +0100)]
Remove incorrect TODO and meta-data.
SHOW_INPUT_METHOD_PICKER is only used to call into
the InputMethodManagerService which as its a system
service could handle calls from the managed profile
if it desired. Howwever profiles use input methods
from the parent user that shouldn't be needed.
Bug:
20934597
Change-Id: Id5df6eb693550ff200cbc12ed66de31323689af3
Selim Cinek [Fri, 12 Jun 2015 01:59:54 +0000 (18:59 -0700)]
Added an introduction to the fingerprint enrollment
Bug:
21468315
Change-Id: Ieb691b0e321f44b9bae2f4f8dfd458c24b98a8d9
Adrian Roos [Fri, 12 Jun 2015 00:26:07 +0000 (00:26 +0000)]
Merge "Ensure text is visible when choosing pattern" into mnc-dev
Adrian Roos [Thu, 11 Jun 2015 22:38:34 +0000 (15:38 -0700)]
Ensure text is visible when choosing pattern
Bug:
21639578
Change-Id: Ib948411b3087c752a36ed6f853915e59946c0988
Amit Mahajan [Fri, 5 Jun 2015 22:31:34 +0000 (15:31 -0700)]
Change to trigger client initiated OMA-DM session on System update req.
Bug:
21603815
Change-Id: I401099a9aeced578ee914ddbebf1f5982f276780
Jorim Jaggi [Thu, 11 Jun 2015 22:34:52 +0000 (22:34 +0000)]
Merge "Refine fingerprint enrollment experience" into mnc-dev
Jorim Jaggi [Wed, 10 Jun 2015 22:05:30 +0000 (15:05 -0700)]
Refine fingerprint enrollment experience
- Flash fingerprint graphic when enrollment progresses
- Show hint message when not progressing for a few seconds
- Make sure animation is always working
Bug:
21617091
Bug:
21644138
Change-Id: Ic54c10a655e6da914f960cee20f0066b46d87325
Sanket Padawe [Thu, 11 Jun 2015 21:31:34 +0000 (21:31 +0000)]
Merge "String changes for Cellular data toggle summary." into mnc-dev