OSDN Git Service
Anna Galusza [Sat, 6 Feb 2016 01:52:49 +0000 (17:52 -0800)]
Change style of Preview screens (dark borders with "preview" on the bottom).
Change-Id: I754a3fd4de47ef74a3a79e410890133de9e0d095
Jason Monk [Thu, 4 Feb 2016 20:54:02 +0000 (20:54 +0000)]
Merge "Add animation for condition card height change."
Jason Monk [Thu, 4 Feb 2016 20:29:59 +0000 (15:29 -0500)]
Add animation for condition card height change.
Change-Id: If648914426cf6db5b039114cf593915c3b2e6c8c
Jason Monk [Thu, 4 Feb 2016 19:47:43 +0000 (19:47 +0000)]
Merge "Settings Visuals"
Jason Monk [Thu, 4 Feb 2016 19:35:49 +0000 (14:35 -0500)]
Settings Visuals
Update the layouts to be more final, and support tablets better.
Move about to always be last.
Always see everything.
Change-Id: I4b804c9bfcd4d3b7f978a2617d5c2c2b1cdfa6e4
Casey Burkhardt [Thu, 4 Feb 2016 19:35:53 +0000 (19:35 +0000)]
Merge "Remove ActivityManagerNative dependency for adjusting font scale"
Sudheer Shanka [Thu, 4 Feb 2016 19:14:16 +0000 (19:14 +0000)]
Merge "Use the correct userId when checking if disabled by admin."
Alan Viverette [Thu, 4 Feb 2016 16:42:48 +0000 (11:42 -0500)]
Fix build
Change-Id: Ib87ddd906cc833cc442d8bd168388af0c2fbf8d0
Alan Viverette [Thu, 4 Feb 2016 16:07:42 +0000 (16:07 +0000)]
Merge "App grid preview for screen zoom"
Alan Viverette [Thu, 4 Feb 2016 15:12:05 +0000 (10:12 -0500)]
App grid preview for screen zoom
Change-Id: I718468dc03800d125eea1c57c8e5dfbc84aa3367
Jason Monk [Wed, 3 Feb 2016 22:05:57 +0000 (22:05 +0000)]
Merge "Make cell data usage an array"
Anna Galusza [Wed, 3 Feb 2016 21:40:08 +0000 (21:40 +0000)]
Merge "UI fixes (back arrow, blue switch bar, append whether Talkback is on to summary), Talkback no longer disabled when preference is tapped, fixes SettingsPreferenceFragment to not check parent class to determine whether to show options menu."
Sunny Goyal [Wed, 3 Feb 2016 21:35:20 +0000 (21:35 +0000)]
Merge "Adding fast scroller in app list"
Jason Monk [Wed, 3 Feb 2016 19:11:52 +0000 (19:11 +0000)]
Merge "String refinements touch -> tap"
Jason Monk [Wed, 3 Feb 2016 18:55:48 +0000 (18:55 +0000)]
Merge "Change receiver name attribute for DISCOVERABLE_TIMEOUT" am:
8cb4301b59
am:
bf942b7e11
* commit '
bf942b7e11df7ef29b64eb8941dc6d08082b89ba':
Change receiver name attribute for DISCOVERABLE_TIMEOUT
Jason Monk [Wed, 3 Feb 2016 18:53:44 +0000 (18:53 +0000)]
Merge "Change receiver name attribute for DISCOVERABLE_TIMEOUT"
am:
8cb4301b59
* commit '
8cb4301b59f95bff09526c32b30ecde396e164f7':
Change receiver name attribute for DISCOVERABLE_TIMEOUT
Jason Monk [Wed, 3 Feb 2016 18:48:27 +0000 (18:48 +0000)]
Merge "Change receiver name attribute for DISCOVERABLE_TIMEOUT"
Jason Monk [Wed, 3 Feb 2016 18:31:38 +0000 (13:31 -0500)]
String refinements touch -> tap
Bug:
26562712
Change-Id: I8435f11e58098ec5eafad6204bc5426fe67205ab
Jason Monk [Wed, 3 Feb 2016 18:13:15 +0000 (13:13 -0500)]
Make cell data usage an array
Change-Id: I39ad23882ec30c733281f87ce3c8056bc8ef4bde
Jason Monk [Wed, 3 Feb 2016 18:09:41 +0000 (18:09 +0000)]
Merge "Broadscale logging for Settings"
Udam Saini [Wed, 3 Feb 2016 17:54:16 +0000 (17:54 +0000)]
Merge "Start redaction activity after we finish current activity."
Geoff Mendal [Wed, 3 Feb 2016 17:19:25 +0000 (17:19 +0000)]
Import translations. DO NOT MERGE am:
10a758b8b7 -s ours am:
3abb7c0351 -s ours
am:
4de59d3cdf -s ours
* commit '
4de59d3cdfe375dc3f84a9e83e2130b494682031':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 17:19:05 +0000 (17:19 +0000)]
Import translations. DO NOT MERGE am:
dd33e41c5a -s ours
am:
2e3f763b9c -s ours
* commit '
2e3f763b9c715baa0610c8d5d52d1cfa4f72fb2c':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 16:57:07 +0000 (16:57 +0000)]
Import translations. DO NOT MERGE am:
10a758b8b7 -s ours
am:
3abb7c0351 -s ours
* commit '
3abb7c035126e7150d90c45c18c155547b3e2a66':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 16:45:28 +0000 (16:45 +0000)]
Import translations. DO NOT MERGE
am:
dd33e41c5a -s ours
* commit '
dd33e41c5a722548027919efdb70b282505e328a':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 16:36:53 +0000 (16:36 +0000)]
Import translations. DO NOT MERGE
am:
10a758b8b7 -s ours
* commit '
10a758b8b7869726a70b2d8fa01221ade1e48181':
Import translations. DO NOT MERGE
Oleksandr Peletskyi [Wed, 3 Feb 2016 15:45:09 +0000 (15:45 +0000)]
Merge "Gray out Wallpapers menu item when setting of wallpapers is not allowed. BUG:
24890474"
Geoff Mendal [Wed, 3 Feb 2016 15:43:34 +0000 (07:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic601f7d4be7b8329b5092836469cfaf352d3ac45
Auto-generated-cl: translation import
Geoff Mendal [Wed, 3 Feb 2016 15:34:47 +0000 (07:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3d3c5d3b41843dab533b33325e67de3de8a88440
Auto-generated-cl: translation import
Sudheer Shanka [Wed, 3 Feb 2016 15:31:57 +0000 (15:31 +0000)]
Merge "Add padlocks to more preferences that can be disabled by admin."
Geoff Mendal [Wed, 3 Feb 2016 14:44:39 +0000 (06:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8f300745f44ddf8d429aa27beba2fc34bf8c9d49
Auto-generated-cl: translation import
Robin Lee [Wed, 3 Feb 2016 13:02:05 +0000 (13:02 +0000)]
Merge "Use MetricsEvent.USER_CREDENTIALS"
Udam Saini [Wed, 3 Feb 2016 01:02:29 +0000 (17:02 -0800)]
Start redaction activity after we finish current activity.
This is needed so that activity manager won't start a new task stack.
During setup, we want everything on the same task stack to allow
task locking.
Change-Id: Iaa1e13da8251ad37362ea41b374300268b6e9875
Udam Saini [Wed, 3 Feb 2016 01:02:08 +0000 (01:02 +0000)]
Merge "Allows user to skip fingerprint during setup"
Sudheer Shanka [Wed, 3 Feb 2016 00:24:52 +0000 (00:24 +0000)]
Add padlocks to more preferences that can be disabled by admin.
Bug:
26899715
Bug:
26767574
Bug:
26768057
Change-Id: I2dc590833cbee1e35047002ef554432f10ddc654
Anna Galusza [Sat, 30 Jan 2016 01:32:19 +0000 (17:32 -0800)]
UI fixes (back arrow, blue switch bar, append whether Talkback is on to
summary), Talkback no longer disabled when preference is tapped, fixes
SettingsPreferenceFragment to not check parent class to determine whether to
show options menu.
Change-Id: I3345e1a878f51b4387ca1bfe89855339617a94d6
Paul Lawrence [Tue, 2 Feb 2016 21:54:06 +0000 (21:54 +0000)]
Merge "Don't show 'unlock at boot' for file encryption"
Noah Wang [Tue, 2 Feb 2016 20:36:47 +0000 (20:36 +0000)]
Merge "Replace SeekBar with LabeledSeekBar for Accessibility-related settings in order to adjust the nonsense read-out by talkback."
Sudheer Shanka [Fri, 29 Jan 2016 22:12:30 +0000 (22:12 +0000)]
Use the correct userId when checking if disabled by admin.
And when adding accounts if only one account type is possible and
it is disabled by admin, show the admin support dialog.
Bug:
26897250
Bug:
26767564
Change-Id: I5cca64491a100efc34307c45aa35c14412f043cd
Noah Wang [Tue, 26 Jan 2016 04:14:42 +0000 (20:14 -0800)]
Replace SeekBar with LabeledSeekBar for Accessibility-related settings
in order to adjust the nonsense read-out by talkback.
Change-Id: I5d2d333c045c3753784b01f731e68918d1175241
Ritesh Reddy [Tue, 2 Feb 2016 20:14:34 +0000 (20:14 +0000)]
Merge "Calling dataChanged() for Net Policy Restrictions" into mm-wireless-dev
am:
d2846524a0
* commit '
d2846524a0aadd8c575f34a80c99823765a7342d':
Calling dataChanged() for Net Policy Restrictions
Ritesh Reddy [Tue, 2 Feb 2016 20:11:46 +0000 (20:11 +0000)]
Merge "Calling dataChanged() for Net Policy Restrictions" into mm-wireless-dev
Julia Reynolds [Tue, 2 Feb 2016 19:46:35 +0000 (19:46 +0000)]
Merge "Clarify notification blocking in notification app list."
Ritesh Reddy [Tue, 2 Feb 2016 18:29:27 +0000 (18:29 +0000)]
Calling dataChanged() for Net Policy Restrictions
Calling BackupManager.dataChanged() to stage the
backup when an option is changed.
Change-Id: I24419f8c71762aae6d1a087479faa8be9062546e
Jeremy Klein [Tue, 2 Feb 2016 19:41:10 +0000 (19:41 +0000)]
Merge "Add unit tests for TetherService."
Jeremy Klein [Tue, 2 Feb 2016 02:58:57 +0000 (18:58 -0800)]
Add unit tests for TetherService.
BUG:
26247383
Change-Id: I07ce14f4a2726e35b8b5665a3e0a8df7af864b3b
Samuel Tan [Tue, 2 Feb 2016 18:59:52 +0000 (18:59 +0000)]
Allow domain suffix match to be set in UI for EAP configurations
am:
d54bbd5193
* commit '
d54bbd519303b8eb0a7822cea00c55ef5e4f6652':
Allow domain suffix match to be set in UI for EAP configurations
Udam Saini [Tue, 2 Feb 2016 18:50:38 +0000 (18:50 +0000)]
Merge "Updates fingerprint icon and text for suggested activities"
Udam Saini [Mon, 1 Feb 2016 23:27:13 +0000 (15:27 -0800)]
Allows user to skip fingerprint during setup
bug:
26906231
Change-Id: Ibc73f2dad01b82f93d92a9351693a221cbe8cf6e
Sunny Goyal [Tue, 2 Feb 2016 02:08:41 +0000 (18:08 -0800)]
Adding fast scroller in app list
Change-Id: I9b5c2225a7acf6d7d83d7d7a7bb08a023a66183d
Udam Saini [Tue, 2 Feb 2016 18:33:40 +0000 (10:33 -0800)]
Updates fingerprint icon and text for suggested activities
bug:
25246207
Change-Id: I91669448c140b565d37563002a3ccbfb211d283b
Julia Reynolds [Tue, 2 Feb 2016 15:17:56 +0000 (10:17 -0500)]
Clarify notification blocking in notification app list.
Change summary to: Normal (nothing blocked), Partially blocked
(at least one topic blocked), or Totally blocked (entire app
blocked).
Allow filtering on apps that are partially or totally blocked.
Bug:
26882239
Change-Id: I29924147a97a3d1693b0286d48905485e11edf1d
Mihai Niță [Tue, 2 Feb 2016 17:40:31 +0000 (17:40 +0000)]
Merge "Using a real Button widget for "Add a language""
Benjamin Franz [Tue, 2 Feb 2016 17:14:07 +0000 (17:14 +0000)]
Merge "Revert "Revert "Read default confirm credentials title from policy"""
Mihai Nita [Tue, 2 Feb 2016 17:02:05 +0000 (09:02 -0800)]
Using a real Button widget for "Add a language"
The initial implementation used a TextView.
But this is cleaner, it is a real button and acts like one.
Bug:
26756569
Change-Id: Ibe3550b0cb81b020dfd4ec6ab29d39a56ba6e1bd
Geoff Mendal [Tue, 2 Feb 2016 17:01:34 +0000 (17:01 +0000)]
Import translations. DO NOT MERGE am:
49a9587ade -s ours am:
1b2a3b18fc -s ours
am:
649bbf765d -s ours
* commit '
649bbf765d5bed3b0446b165aa01fa1b6500d229':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:58:34 +0000 (16:58 +0000)]
Import translations. DO NOT MERGE am:
0873f057db -s ours
am:
83f0595b6e -s ours
* commit '
83f0595b6ec645e033c9638e358bc9d4fe4b3010':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:56:24 +0000 (16:56 +0000)]
Import translations. DO NOT MERGE am:
49a9587ade -s ours
am:
1b2a3b18fc -s ours
* commit '
1b2a3b18fc871fddff6795c24802037c4fb4239a':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:52:59 +0000 (16:52 +0000)]
Import translations. DO NOT MERGE
am:
49a9587ade -s ours
* commit '
49a9587aded906c32cde763ad263e4166913c824':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:52:01 +0000 (16:52 +0000)]
Import translations. DO NOT MERGE
am:
0873f057db -s ours
* commit '
0873f057dbe38f79b499e9988d9db496a32a21f9':
Import translations. DO NOT MERGE
Abodunrinwa Toki [Tue, 2 Feb 2016 16:30:01 +0000 (16:30 +0000)]
Merge "Change the character limit for "Keyboard and input methods" string."
Geoff Mendal [Tue, 2 Feb 2016 16:28:24 +0000 (08:28 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5571d71b847f91111ebc937a387fc97a26546791
Auto-generated-cl: translation import
Abodunrinwa Toki [Tue, 2 Feb 2016 16:26:31 +0000 (16:26 +0000)]
Change the character limit for "Keyboard and input methods" string.
Bug:
26856894
Change-Id: Ic8c6daea79d7f4e19246a6cf00610e5caf138389
Geoff Mendal [Tue, 2 Feb 2016 16:18:55 +0000 (17:18 +0100)]
Import translations. DO NOT MERGE
Change-Id: I747f56476fb70029b7555708f2d9290bd7830021
Auto-generated-cl: translation import
Benjamin Franz [Mon, 1 Feb 2016 17:27:17 +0000 (17:27 +0000)]
Revert "Revert "Read default confirm credentials title from policy""
This reverts commit
ff3d76dfd4c88bdf52ae9467307a86651bf7cd98.
Change-Id: Ibdfdc880629ace541744c2ba1f46393e70ae53f5
Robin Lee [Fri, 29 Jan 2016 13:04:04 +0000 (13:04 +0000)]
Disable VPN prefs for restriction or lockdown case
Change-Id: I2fcf84876bf23b92cdcd00ce93514106914d0c29
Casey Burkhardt [Sun, 31 Jan 2016 18:53:20 +0000 (10:53 -0800)]
Remove ActivityManagerNative dependency for adjusting font scale
ActivityManagerService now holds a ContentObserver for
Settings.System.FONT_SCALE, so it is no longer necessary to notify
ActivityManagerNative of a configuration update involving the font scale
directly.
Bug:
23033258
Change-Id: Ifd002bd25724b133e83a1285be2953019178c65a
Philip P. Moltmann [Mon, 1 Feb 2016 23:42:07 +0000 (23:42 +0000)]
Merge "Use same printer-list template as in the print spooler."
Ido Ofir [Mon, 1 Feb 2016 21:28:05 +0000 (21:28 +0000)]
Merge "Remove payments from settings suggestions."
Ido Ofir [Mon, 1 Feb 2016 21:17:40 +0000 (21:17 +0000)]
Merge "Adding hotword category to Settings suggested steps."
Jeff Sharkey [Mon, 1 Feb 2016 17:40:05 +0000 (10:40 -0700)]
System paths are okay now; no more special-casing.
Bug:
26895798
Change-Id: I41df87f1fe77c2c523272cf43b5db6a0a7395bed
Jason Monk [Mon, 1 Feb 2016 16:39:35 +0000 (16:39 +0000)]
Merge "Metrics more of the things"
Benjamin Franz [Mon, 1 Feb 2016 16:34:26 +0000 (16:34 +0000)]
Merge "Revert "Read default confirm credentials title from policy""
Benjamin Franz [Mon, 1 Feb 2016 16:27:16 +0000 (16:27 +0000)]
Revert "Read default confirm credentials title from policy"
This reverts commit
6e2821dc1ab96de168a057d25acc1ad87e50e606.
Bug:
26895493
Change-Id: I27e7199dc25d423219d966f9f2cbd671bbf094c7
Geoff Mendal [Mon, 1 Feb 2016 15:44:53 +0000 (15:44 +0000)]
Import translations. DO NOT MERGE am:
66382c5667 -s ours am:
5f050823b1 -s ours
am:
ec2416947d -s ours
* commit '
ec2416947dd45e54ef5c837a0af0b4e121a77dae':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Feb 2016 15:43:02 +0000 (15:43 +0000)]
Import translations. DO NOT MERGE am:
66382c5667 -s ours
am:
5f050823b1 -s ours
* commit '
5f050823b1ceb2f0f789e9d13cf009f323c70040':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Feb 2016 15:43:02 +0000 (15:43 +0000)]
Import translations. DO NOT MERGE am:
67603ccc01 -s ours
am:
ff50dbd224 -s ours
* commit '
ff50dbd22459e984f4aa17a79abf7f26c2936020':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Feb 2016 15:41:11 +0000 (15:41 +0000)]
Import translations. DO NOT MERGE
am:
67603ccc01 -s ours
* commit '
67603ccc0154a12e3bd08ea96bfda012098c024f':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Feb 2016 15:41:10 +0000 (15:41 +0000)]
Import translations. DO NOT MERGE
am:
66382c5667 -s ours
* commit '
66382c5667eec5411e0043b8668237f04b0e6f25':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Feb 2016 15:33:16 +0000 (07:33 -0800)]
Import translations. DO NOT MERGE
Change-Id: I807c37bd4191712a2408d46f35cf88caf72f1f75
Auto-generated-cl: translation import
Geoff Mendal [Mon, 1 Feb 2016 15:24:56 +0000 (07:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie7dce1455e8b29196b023509228f876c105f5705
Auto-generated-cl: translation import
Geoff Mendal [Mon, 1 Feb 2016 14:35:28 +0000 (14:35 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 1 Feb 2016 14:34:43 +0000 (06:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0e45cffaaf587a0fd84d06c592fc7e512d1915e0
Auto-generated-cl: translation import
Jason Monk [Mon, 1 Feb 2016 14:27:58 +0000 (14:27 +0000)]
Merge "Fix dream settings initial state."
Robin Lee [Mon, 1 Feb 2016 12:52:16 +0000 (12:52 +0000)]
Use MetricsEvent.USER_CREDENTIALS
Bug:
22541933
Change-Id: I0f4bc76933ec04d3e9146a354ea2e1feee1d8e0a
Clara Bayarri [Mon, 1 Feb 2016 10:09:18 +0000 (10:09 +0000)]
Merge "Make Lockscreen Notification Content work for profiles"
Jason Monk [Sat, 30 Jan 2016 17:15:11 +0000 (12:15 -0500)]
Fix dream settings initial state.
The empty view wasn't being updated initially by the fragment
so it was being left in an empty state since no preferences are
added after the fact.
Bug:
25609200
Change-Id: Ib9aa02ba94bf7077d01892d96d79d39203047f4d
Jason Monk [Sat, 30 Jan 2016 16:57:30 +0000 (11:57 -0500)]
Fix storage preference animating away
Init it during the onCreate so it just doesn't appear.
Bug:
25606221
Change-Id: I899521590eae8d12c09938f8aa77680e3e277742
Jason Monk [Sat, 30 Jan 2016 16:36:52 +0000 (11:36 -0500)]
Metrics more of the things
Add a dump for some of the state of the device.
Bug:
26687707
Change-Id: Icf517912b3006cc84c26863eb1b93d586a55464a
Jason Monk [Wed, 20 Jan 2016 19:41:52 +0000 (14:41 -0500)]
Broadscale logging for Settings
Bug:
26687914
Change-Id: Ida75ccf95376538e2ba95d212d333c40fd2dd6e0
Ido Ofir [Sat, 30 Jan 2016 00:49:16 +0000 (16:49 -0800)]
Adding hotword category to Settings suggested steps.
Change-Id: I1f8c349b5cdd37cddd6b629121af03fb3b6695c6
Samuel Tan [Fri, 29 Jan 2016 21:26:17 +0000 (13:26 -0800)]
Allow domain suffix match to be set in UI for EAP configurations
Add a "domain" field that allows the user to specify a domain
suffix match for an EAP network configuration. This field
will only be available when the user specifies a CA certificate for
an EAP-PEAP, EAP-TLS, or EAP-TTLS network. Under the hood, the
value entered into this field will be passed to WPA supplicant
as the |domain_suffix_match| configuration variable.
BUG:
25180141
Change-Id: Ib69b9519f475e90e40441ddff61c80be43cf624b
TEST: On angler, domain field appears for the EAP-PEAP, EAP-TLS
TEST: and EAP-TTLS networks.
Jorim Jaggi [Fri, 29 Jan 2016 23:17:27 +0000 (23:17 +0000)]
Merge "Enable multi-dex for incremental settings builds"
Jorim Jaggi [Fri, 29 Jan 2016 04:06:32 +0000 (20:06 -0800)]
Enable multi-dex for incremental settings builds
Change-Id: I265eb5ff508206bd5b4205db612c3519bb9a5ed8
Noah Wang [Fri, 29 Jan 2016 21:45:54 +0000 (21:45 +0000)]
Merge "Adding placeholder for preview screens for screen zoom (magnifying screen)"
Ido Ofir [Fri, 29 Jan 2016 20:55:28 +0000 (12:55 -0800)]
Remove payments from settings suggestions.
Bug:
26770145
Change-Id: I269b78cfde45bd4a9c1669bc9425676404d54188
Paul Lawrence [Fri, 29 Jan 2016 21:25:36 +0000 (13:25 -0800)]
Don't show 'unlock at boot' for file encryption
Change-Id: I8906023942a2fa0c5c303aeabb48737ec43fc737
Adrian Roos [Fri, 29 Jan 2016 20:44:15 +0000 (20:44 +0000)]
Merge "Follow up to I15baa5b1d19324521070d641ae6a227d782a4e9e"
Adrian Roos [Fri, 29 Jan 2016 20:35:37 +0000 (12:35 -0800)]
Follow up to I15baa5b1d19324521070d641ae6a227d782a4e9e
Bug:
19003093
Change-Id: I0e1dddb57e347c81d01abb7025144fadf6e53fe4
Maria Garcia Puyol [Fri, 29 Jan 2016 19:24:20 +0000 (19:24 +0000)]
Merge "Add Emergency Info preference to user settings"
OSDN Git Service
