OSDN Git Service
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
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
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
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
Sanket Padawe [Thu, 11 Jun 2015 21:29:30 +0000 (21:29 +0000)]
Merge "String changes for PBAP chekcbox in BT pairing dialog." into mnc-dev
Makoto Onuki [Fri, 5 Jun 2015 00:45:03 +0000 (17:45 -0700)]
Promote "add service" from menu to list item
Also show the app icon for each service.
Bug
19914125
Change-Id: I592c526746a3ec9f67e8e8a6c6f1530e7724e310
Jeff Sharkey [Thu, 11 Jun 2015 20:45:09 +0000 (20:45 +0000)]
Merge "Always round migration times up to 1 second." into mnc-dev
Jeff Sharkey [Thu, 11 Jun 2015 20:43:38 +0000 (13:43 -0700)]
Always round migration times up to 1 second.
Bug:
21755250
Change-Id: I4e5eef493f2f923d0bcf110133e862c4a4a7db8b
Sanket Padawe [Thu, 11 Jun 2015 20:37:55 +0000 (13:37 -0700)]
String changes for PBAP chekcbox in BT pairing dialog.
Bug:
20488109
Change-Id: I922477c94cbf9c4042d8a895eb10a41da2783f14
Sanket Padawe [Thu, 11 Jun 2015 20:31:39 +0000 (13:31 -0700)]
String changes for Cellular data toggle summary.
Bug:
17073752
Change-Id: I61974ab3b2b2136aa5eb5027fc826d635a705ed1
Jason Monk [Thu, 11 Jun 2015 19:56:49 +0000 (19:56 +0000)]
Merge "Clean up settings shortcuts" into mnc-dev
Jason Monk [Thu, 11 Jun 2015 19:47:29 +0000 (15:47 -0400)]
Clean up settings shortcuts
- Remove some bad entries
- Fix icons to be top-level item specific
- Add memory
Bug:
20632230
Change-Id: I067b467b9ee354b52ef61b312dc5a89fd7eae2ac
Sanket Padawe [Thu, 11 Jun 2015 17:34:38 +0000 (10:34 -0700)]
Fix button layout issue for sv-SE locale.
Bug:
21479378
Change-Id: I4858958a26b183461490c052fece66941314edcc
Jeff Sharkey [Thu, 11 Jun 2015 16:20:22 +0000 (16:20 +0000)]
Merge "Slow dialog string has no limit." into mnc-dev
Jeff Sharkey [Thu, 11 Jun 2015 16:18:00 +0000 (09:18 -0700)]
Slow dialog string has no limit.
Bug:
21342398
Change-Id: Id8318e3341223e084b5af4719af504f5247a5195
Paul Jensen [Thu, 11 Jun 2015 14:26:33 +0000 (10:26 -0400)]
Remove dead hidden ConnectivityManager and NetworkInfo APIs.
Change-Id: Ifa44c7553c7c45ebe261a2a124d9bf8d6f96c690
John Spurlock [Thu, 11 Jun 2015 14:08:44 +0000 (14:08 +0000)]
Merge "Settings: Follow frameworks change to volume sliders." into mnc-dev
John Spurlock [Wed, 10 Jun 2015 21:46:58 +0000 (17:46 -0400)]
Settings: Follow frameworks change to volume sliders.
Bug:
21267436
Change-Id: I72c6411346429ebf428662d1c6d6d8a7529c0d67
Lorenzo Colitti [Thu, 11 Jun 2015 03:06:47 +0000 (03:06 +0000)]
Merge "Add a string for switching to cell when Wi-Fi loses backhaul." into mnc-dev
Sanket Padawe [Thu, 11 Jun 2015 01:41:20 +0000 (01:41 +0000)]
Merge "Fix SimPreference dialog from closing on orientation change." into mnc-dev
Selim Cinek [Thu, 11 Jun 2015 01:10:49 +0000 (01:10 +0000)]
Merge "Added setting strings for new fingerprint introduction screen" into mnc-dev
Selim Cinek [Thu, 11 Jun 2015 00:42:23 +0000 (17:42 -0700)]
Added setting strings for new fingerprint introduction screen
Bug:
21468315
Change-Id: I206d5eef7194b75e242e4b33d4d0be17ce03572d
Sanket Padawe [Thu, 11 Jun 2015 00:46:31 +0000 (17:46 -0700)]
Fix SimPreference dialog from closing on orientation change.
Bug:
19041463
Change-Id: I8c91fd6f01bbeb7561365dbb76ba3d4c05b76efc
Jeff Sharkey [Thu, 11 Jun 2015 00:27:44 +0000 (17:27 -0700)]
Follow string refactoring.
Change-Id: Ib450724a20283a3bf356593e487b8ee6e9c8de5c
Jeff Sharkey [Wed, 10 Jun 2015 21:21:19 +0000 (14:21 -0700)]
New strings!
Bug:
21737573,
21666225,
21756698,
21737666,
21471429
Change-Id: If74f6cc15dfaa16bd78afebc5fc8a977b61cb6b0
Lajos Molnar [Wed, 10 Jun 2015 23:23:49 +0000 (23:23 +0000)]
Merge "developer settings: remove "Use deprecated AwesomePlayer" settings" into mnc-dev
Jorim Jaggi [Wed, 10 Jun 2015 23:10:06 +0000 (23:10 +0000)]
Merge "Animations/success state for external confirm device credentials (2/2)" into mnc-dev
Lucky Zhang [Wed, 10 Jun 2015 23:01:25 +0000 (23:01 +0000)]
Merge "[Settings] Pass lock type extra back to SUW" into mnc-dev
Jorim Jaggi [Tue, 9 Jun 2015 22:31:28 +0000 (15:31 -0700)]
Animations/success state for external confirm device credentials (2/2)
Bug:
20929186
Change-Id: I4489dd37f1148fb03315ec337a546eee04660cb5
Lajos Molnar [Wed, 10 Jun 2015 21:57:48 +0000 (14:57 -0700)]
developer settings: remove "Use deprecated AwesomePlayer" settings
Bug:
17108024
Change-Id: I602eba3214cacef7435ce6347e885c040d5c443c
Nick Kralevich [Wed, 10 Jun 2015 21:11:31 +0000 (21:11 +0000)]
Merge "Fix USB access control when adb is disabled." into mnc-dev
Jason Monk [Wed, 10 Jun 2015 20:26:12 +0000 (20:26 +0000)]
Merge "Hide tap to wake on devices that don't support it" into mnc-dev
Jason Monk [Mon, 8 Jun 2015 13:11:48 +0000 (09:11 -0400)]
Hide tap to wake on devices that don't support it
Bug:
21650579
Change-Id: I3fbcccc80b5773c74d8398f1d23b4762a5bf54ed
Jason Monk [Wed, 10 Jun 2015 20:12:06 +0000 (20:12 +0000)]
Merge "App storage settings - Request size onResume" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 20:08:01 +0000 (16:08 -0400)]
App storage settings - Request size onResume
Our data might be stale (especially when coming from manage space
activities).
Bug:
21680510
Change-Id: Ifb919e05f23f76677b6de2aff3d13d00e195facb
Jason Monk [Wed, 10 Jun 2015 20:06:09 +0000 (20:06 +0000)]
Merge "New dialog for ignore battery optimizations" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 15:03:06 +0000 (11:03 -0400)]
New dialog for ignore battery optimizations
Bug:
21375688
Change-Id: I7240cc0615044cf5a34349e5ffdf2ae2e0f6333f
Lucky Zhang [Wed, 10 Jun 2015 18:05:09 +0000 (11:05 -0700)]
[Settings] Pass lock type extra back to SUW
When SetupChooseLockGeneric finishes, it will include the lock type
(password quality) as an extra in the returned intent data. This extra
will be used by Setup Wizard to determine the lock type and log it for
the metrics.
Bug:
20349248
Change-Id: I501e07254ab857ad4f137e7050326415853883d1
Jason Monk [Wed, 10 Jun 2015 19:26:35 +0000 (15:26 -0400)]
Add string for profile owner usage access warning
Bug:
20751702
Change-Id: Ib885befdefa18d21a243478d59b1d240bc7a1c68
Jeff Brown [Wed, 10 Jun 2015 19:21:09 +0000 (19:21 +0000)]
Merge "Add simulated 4K display modes." into mnc-dev
Nick Kralevich [Wed, 10 Jun 2015 16:39:26 +0000 (09:39 -0700)]
Fix USB access control when adb is disabled.
When adb is disabled, the default usb mode would be "none", which
would turn off the driver and prevent UsbDeviceManager from receiving
any new USB connect / disconnect messages. This prevents the user
from ever enabling MTP and sharing data when adb is turned off.
As discussed in bug
21429947, we work around this problem by keeping
the USB driver in MTP mode most of the time, so that we continue to
receive USB connect / disconnect messages.
To avoid leaking confidential user photos, we now explicitly unlock
USB data after switching into MTP/PTP mode. Enabling MTP mode is
now decoupled from exposing data on the USB connection.
Bug:
21429947
Change-Id: Id8e9df4ac42fdcf22cc5b75b838bf46f6c225081
Xiyuan Xia [Wed, 10 Jun 2015 17:08:43 +0000 (17:08 +0000)]
Merge "Implement default assist app setting" into mnc-dev
Makoto Onuki [Wed, 10 Jun 2015 16:39:06 +0000 (16:39 +0000)]
Merge "Show list of permissions instead of just numbers" into mnc-dev
Xiyuan Xia [Tue, 2 Jun 2015 21:55:32 +0000 (14:55 -0700)]
Implement default assist app setting
- Add "None" support to AppListPreference
- Add DefaultAssistPreference to manage assist;
- Add AppListPreferenceWithSettings to show a settings icon;
- Implement DefaultAssistPreference based on AppListPreferenceWithSettings;
- Move voice input settings into ManageAssist and implement it
based on AppListPreferenceWithSettings;
Bug:
20210110
Change-Id: If283b8b55a46b428ecfa6e45dc2123292b1d4302
Lorenzo Colitti [Wed, 10 Jun 2015 15:25:24 +0000 (15:25 +0000)]
Merge changes from topic 'no-internet-notification' into mnc-dev
* changes:
Pass in the netId using intent data, not intent extras.
Reword "no internet access" dialog to conform with mocks.
Geoff Mendal [Wed, 10 Jun 2015 15:25:01 +0000 (15:25 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 14:02:59 +0000 (10:02 -0400)]
Fix legal info back button
Make it its own SettingsPreferenceFragment.
whitespace--
Bug:
20727881
Change-Id: I1f790af03d316c1d43377a6d8606084d9f3a747f
Geoff Mendal [Wed, 10 Jun 2015 15:04:57 +0000 (08:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7e0cc3842d3422193de12b6b718237995f25db68
Auto-generated-cl: translation import
Lorenzo Colitti [Wed, 10 Jun 2015 08:03:46 +0000 (17:03 +0900)]
Add a string for switching to cell when Wi-Fi loses backhaul.
We have not yet decided whether to surface this setting, but
we need to get it in before string freeze in case we do want to
expose it.
Bug:
20896761
Change-Id: I1c99229a284a0ae86ab191ae90a7dff497984fea
Lorenzo Colitti [Wed, 10 Jun 2015 13:49:52 +0000 (22:49 +0900)]
Pass in the netId using intent data, not intent extras.
This allows ConnectivityService to use different PendingIntents
for different dialogs; two PendingIntents that differ in their
data are treated as different, but two PendingIntents that differ
only in their extras are treated as being the same.
Bug:
20081183
Change-Id: Ie1bdcf2a0a0747be815ea528db0cb34f5ab415b9
Lorenzo Colitti [Wed, 10 Jun 2015 06:16:36 +0000 (15:16 +0900)]
Reword "no internet access" dialog to conform with mocks.
Bug:
20081183
Bug:
20739299
Change-Id: I63e58dafcba879c56669766f652729a73ef722e2
Chris Wren [Wed, 10 Jun 2015 14:14:38 +0000 (14:14 +0000)]
Merge "annoint new constants" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 13:04:14 +0000 (09:04 -0400)]
Remove periods from ignore optimizations summaries
Bug:
21375688
Change-Id: Id37cbac60db461bfc0da505ad5d4346382c8e76c
Jason Monk [Wed, 10 Jun 2015 12:59:32 +0000 (12:59 +0000)]
Merge "Advanced apps updates (2/2)" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 12:59:29 +0000 (12:59 +0000)]
Merge "Add sd card string, just in case" into mnc-dev
Neil Fuller [Wed, 10 Jun 2015 12:23:45 +0000 (12:23 +0000)]
Merge "Modifications for changes to SettingsLib" into mnc-dev
The Android Automerger [Wed, 10 Jun 2015 08:04:19 +0000 (01:04 -0700)]
merge in mnc-release history after reset to mnc-dev
Jeff Brown [Wed, 10 Jun 2015 01:25:04 +0000 (18:25 -0700)]
Add simulated 4K display modes.
Bug:
18241736
Change-Id: Ic56a756601dd1cc1bf125fe30965f80d63d92b4e
Fyodor Kupolov [Tue, 9 Jun 2015 22:57:26 +0000 (22:57 +0000)]
Merge "Guest option should not be shown for the guest user" into mnc-dev
Fyodor Kupolov [Tue, 9 Jun 2015 22:54:28 +0000 (15:54 -0700)]
Guest option should not be shown for the guest user
Bug:
21649480
Change-Id: I866e34543c6ba396533f9acfef056390cf19608d
Casper Bonde [Fri, 8 May 2015 13:19:03 +0000 (15:19 +0200)]
SAP: Make it possible to enforce a 16-digit pin code (5/5)
This change enable the posibility to enforce using a
16-digit pin or MITM for a RFCOMM or L2CAP connection.
This is needed for the SIM access profile.
Change-Id: I6bb2b0dff1ebf4b4f1d8faad97aa7c480000d3ea
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
Paul Lawrence [Tue, 9 Jun 2015 20:56:24 +0000 (20:56 +0000)]
Merge "Move CryptKeeper to own process" into mnc-dev
Jason Monk [Tue, 9 Jun 2015 20:30:34 +0000 (20:30 +0000)]
Merge "Top level: "Storage" -> "Storage & USB"" into mnc-dev
Jason Monk [Tue, 9 Jun 2015 20:25:32 +0000 (16:25 -0400)]
Add sd card string, just in case
Bug:
21471429
Change-Id: Iac3cd1643b8aa3a62a0c97c8046cb365dfeaf527
Jason Monk [Tue, 9 Jun 2015 20:01:28 +0000 (16:01 -0400)]
Advanced apps updates (2/2)
Change the title of the screen, add a category to break things up
Bug:
21372377
Change-Id: I03c2060937f540235755e4b74c5634543e526d25
Jason Monk [Tue, 9 Jun 2015 19:50:11 +0000 (19:50 +0000)]
Merge "Accounts -> Account sync" into mnc-dev
Jason Monk [Tue, 9 Jun 2015 19:49:22 +0000 (19:49 +0000)]
Merge "Bring back gear icon for advanced app settings" into mnc-dev