git.osdn.net Git - android-x86/packages-apps-Settings.git/log

Svetoslav [Mon, 27 Oct 2014 20:39:09 +0000 (20:39 +0000)]

am b1766368: am c8a1bb5a: am 3ea423ae: User to confirm credentials if an accessibility service changes encryption.

* commit 'b1766368538cf428d69f20dd3b00e3efe2b54c8e':

commit | commitdiff | tree

Geoff Mendal [Mon, 27 Oct 2014 20:39:07 +0000 (20:39 +0000)]

am 4402b047: (-s ours) am d33f7d6a: (-s ours) am 4909c412: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '4402b04767b3ae014cbf930d4b7520490a4acfa1':

commit | commitdiff | tree

Jim Miller [Mon, 27 Oct 2014 20:39:06 +0000 (20:39 +0000)]

am c65633eb: am 9afd56e0: am 46c7f6d6: Add a checkbox option to \'require password to decrypt\'

* commit 'c65633eb27e16010e366b09289e33df31855e374':

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 27 Oct 2014 20:39:04 +0000 (20:39 +0000)]

am c4ea2969: am 84ff9901: am 94dce761: Merge "Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity" into lmp-dev

* commit 'c4ea2969f62073a14eecab1bafb1306ffce2edd7':

commit | commitdiff | tree

Jason Monk [Mon, 27 Oct 2014 20:39:03 +0000 (20:39 +0000)]

am ea9819f4: am 8b1fe3b8: am eaf84472: Merge "Update screen pinning strings to say Overview" into lmp-dev

* commit 'ea9819f4ad685318c694c8b3152b4e9ce1382595':

commit | commitdiff | tree

Andres Morales [Mon, 27 Oct 2014 20:39:02 +0000 (20:39 +0000)]

am db4c54b6: am 4a9b3cf5: am 26bc6907: Merge "Set layout_width in WiFi+NFC resource" into lmp-dev

* commit 'db4c54b68f777438771cbf2887df03b3beab6e56':

commit | commitdiff | tree

vandwalle [Mon, 27 Oct 2014 20:39:01 +0000 (20:39 +0000)]

am 9ef77359: am 60790f7b: am 2fb9c773: Merge "dont show a config in saved network if it is self added and we never connected to it Bug:17939405" into lmp-dev

* commit '9ef7735987e35dc40474c8727aff6a0a68180ddf':

commit | commitdiff | tree

Geoff Mendal [Mon, 27 Oct 2014 20:39:00 +0000 (20:39 +0000)]

am 595c3349: (-s ours) am a9cd186c: (-s ours) am e4d510fa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '595c3349d84473ebfb4883b1d346ac02300fd692':

commit | commitdiff | tree

John Spurlock [Mon, 27 Oct 2014 20:38:59 +0000 (20:38 +0000)]

am 590f44a2: am b3ce7874: am a312f7f8: Fix battery-history-chart large-mode labels in RTL layouts.

* commit '590f44a2df0f370d98134d0571763f9f8460b003':

commit | commitdiff | tree

Alan Viverette [Mon, 27 Oct 2014 20:38:58 +0000 (20:38 +0000)]

am 061c8b00: am 673e3c28: am 178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev

* commit '061c8b0011f433be0a2304f8cb7423e042905ec9':

commit | commitdiff | tree

Amit Mahajan [Mon, 27 Oct 2014 20:38:57 +0000 (20:38 +0000)]

am b1d81165: am 6f451050: am 88b2790d: Merge "Fix to show signal strength as 0 if out of service." into lmp-dev

* commit 'b1d81165ceec380a5db553ff790730b51d8056f9':

commit | commitdiff | tree

Dianne Hackborn [Mon, 27 Oct 2014 20:38:56 +0000 (20:38 +0000)]

am 88f7a6a7: am df8683d2: am a4204bde: Merge "Update to use "real" L codename." into lmp-dev

* commit '88f7a6a7c138cfdc1a52e04ece136e039060970f':

commit | commitdiff | tree

Zoltan Szatmary-Ban [Mon, 27 Oct 2014 20:38:55 +0000 (20:38 +0000)]

am 21b3566d: am 4ce8802e: am 50263efb: Remove CA Cert UI item from one list only

* commit '21b3566dfb31288a2fe7e57cb6986afc17cfe643':

commit | commitdiff | tree

Amith Yamasani [Mon, 27 Oct 2014 20:38:54 +0000 (20:38 +0000)]

am 69f5e5ed: am 195b1583: am 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev

* commit '69f5e5ed63cbbed6cbb7c60714e28c324b2bcac0':

commit | commitdiff | tree

Geoff Mendal [Mon, 27 Oct 2014 20:38:53 +0000 (20:38 +0000)]

am 5af09c9d: (-s ours) am 185e1722: (-s ours) am 7096c2dd: (-s ours) Import translations. DO NOT MERGE

* commit '5af09c9d8e1583a1d0592ac8e53eb39e4ec91d7b':

commit | commitdiff | tree

Baligh Uddin [Mon, 27 Oct 2014 20:38:52 +0000 (20:38 +0000)]

am adcf72ab: (-s ours) am bbf9927b: (-s ours) am 43848de1: (-s ours) Import translations. DO NOT MERGE

* commit 'adcf72abda4c2595110838fd1dfee83b65ea47e6':

commit | commitdiff | tree

Svetoslav [Mon, 27 Oct 2014 20:38:51 +0000 (20:38 +0000)]

am f7b5f424: am b792f69e: am 5cdd3f4f: Update accessibility plus secure lock warning messages.

* commit 'f7b5f424d58e5b6474929ce9bf75d22b8ed3b079':

commit | commitdiff | tree

John Spurlock [Mon, 27 Oct 2014 20:38:50 +0000 (20:38 +0000)]

am b96de5b0: am 041ebc1b: am c05b739c: Merge "Settings: Update media & alarm stream icons." into lmp-dev

* commit 'b96de5b088b1e30ee0dcc9bc2914e18d21e4ac93':

commit | commitdiff | tree

PauloftheWest [Mon, 27 Oct 2014 20:38:49 +0000 (20:38 +0000)]

am 94841dc1: am d005440f: am 6e26427e: Updated Wi-Fi hotspot dialog to the Material Spec.

* commit '94841dc1e5df150b63e4709758cbc022800ee8b3':

commit | commitdiff | tree

PauloftheWest [Mon, 27 Oct 2014 20:38:48 +0000 (20:38 +0000)]

am 86ac419c: am 324f29c8: am 59d33dbd: Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev

* commit '86ac419cad6ef4a8dfe751debf9404dce0e65209':

commit | commitdiff | tree

Alan Viverette [Mon, 27 Oct 2014 20:38:47 +0000 (20:38 +0000)]

am ffac1ac9: am dc174c85: am 7a4d229d: Merge "Ensure recycled APN preferences are updated to show radio button" into lmp-dev

* commit 'ffac1ac92f3da89b21b6370d6f657fba81415fbc':

commit | commitdiff | tree

Baligh Uddin [Mon, 27 Oct 2014 20:38:45 +0000 (20:38 +0000)]

am 0627d066: (-s ours) am ee3d7127: (-s ours) am 9d4dc326: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '0627d066ca3433b62e8f781dfedcf32d0742f1a8':

commit | commitdiff | tree

Hui Shu [Mon, 27 Oct 2014 20:38:45 +0000 (20:38 +0000)]

am f3acb3ad: am bbb8928a: am 905f9e2f: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev

* commit 'f3acb3ad2e13953186ae9a7697ed726feb106a9b':

commit | commitdiff | tree

Zoltan Szatmary-Ban [Mon, 27 Oct 2014 20:38:44 +0000 (20:38 +0000)]

am b8acc5ac: am 9cb9286d: am b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev

* commit 'b8acc5ac4d84368fb953b0ee7b29ed014cb67733':

commit | commitdiff | tree

Maurice Lam [Mon, 27 Oct 2014 20:38:42 +0000 (20:38 +0000)]

am 923ac8d1: am 001d8540: am f7b56708: Merge "[WifiSetup] Update background texture" into lmp-dev

* commit '923ac8d16a292e42289a41da3859763af0ca41f6':

commit | commitdiff | tree

Svetoslav [Mon, 27 Oct 2014 20:38:41 +0000 (20:38 +0000)]

am 8ecde61d: am 6b5b77d2: am 52448442: Use default encryption password if an accessibility service is enabled.

* commit '8ecde61de7181b69da4a9d022972fe4d1b4133ad':

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 27 Oct 2014 20:38:40 +0000 (20:38 +0000)]

am ed27383a: am ca99afb5: am fc14e272: Merge "Update Settings App icons" into lmp-dev

* commit 'ed27383a9c256498ee5b3e4c44821329227ea657':

commit | commitdiff | tree

PauloftheWest [Mon, 27 Oct 2014 20:38:39 +0000 (20:38 +0000)]

am 6073d5b0: am c0d0a208: am 29aab7a2: Fixed a Settings crash.

* commit '6073d5b0d910a5fbbc4a6b5adbaf1200640f2fc4':

commit | commitdiff | tree

Baligh Uddin [Mon, 27 Oct 2014 20:38:38 +0000 (20:38 +0000)]

am 9e5d2e4a: (-s ours) am 08a08b34: (-s ours) am 5c664d8e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '9e5d2e4a0fc899e2720456866d1a215a8c4f147b':

commit | commitdiff | tree

PauloftheWest [Mon, 27 Oct 2014 20:38:38 +0000 (20:38 +0000)]

am b3047a47: am 6dfb48bf: am 709ddd5c: Merge "Fixed multiple MAP issues." into lmp-dev

* commit 'b3047a47050c62173e11c00bcd8ad76c5366567c':

commit | commitdiff | tree

Robert Greenwalt [Mon, 27 Oct 2014 20:38:37 +0000 (20:38 +0000)]

am 77ac3454: am 4670af53: am ce77a43a: Merge "ATT Entitlement changes in Settings to pass Tether Type." into lmp-dev

* commit '77ac34543123e162170a352a3a6efd3922a9f997':

commit | commitdiff | tree

Elliott Hughes [Mon, 27 Oct 2014 20:38:36 +0000 (20:38 +0000)]

am 3bcf9e24: am c9482dd9: am ed6a6ca0: Make the system locale available to the decryption UI.

* commit '3bcf9e24e12f52379e1ef691fde1b3f5a65a02e3':

commit | commitdiff | tree

Alexandra Gherghina [Mon, 27 Oct 2014 20:38:35 +0000 (20:38 +0000)]

am 0f855e80: am e4b18b79: am 9de68440: Merge "Match parent width for user spinner to fix tint" into lmp-dev

* commit '0f855e806a4d01d2d5388e95d2aa8c0a81dc7583':

commit | commitdiff | tree

Alexandra Gherghina [Mon, 27 Oct 2014 20:38:34 +0000 (20:38 +0000)]

am 4f516ac6: am 8e4be6af: am 3c3ceb9d: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev

* commit '4f516ac64597de6ff8f4accc8e4bb3a04e1315fe':

commit | commitdiff | tree

PauloftheWest [Mon, 27 Oct 2014 20:38:33 +0000 (20:38 +0000)]

am 910a335b: am 2af51dbc: am 3aabfca4: Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev

* commit '910a335b362664b7c1a88c87772d72b868b5b16b':

commit | commitdiff | tree

Michael Wright [Mon, 27 Oct 2014 20:38:32 +0000 (20:38 +0000)]

am e696208d: am 2e0d4080: am 1b87bec5: Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev

* commit 'e696208d6119f591bf2136c3d232b6c0581e1bf0':

commit | commitdiff | tree

Zoltan Szatmary-Ban [Mon, 27 Oct 2014 20:38:30 +0000 (20:38 +0000)]

am 08b3692c: am 2d9cbcea: am a2b7bb6b: Merge "Make Force Stop button work for packages of managed profile" into lmp-dev

* commit '08b3692cfd6d94944d99f19f1a5fd89839b18c55':

commit | commitdiff | tree

Zoltan Szatmary-Ban [Mon, 27 Oct 2014 20:38:29 +0000 (20:38 +0000)]

am 03049372: am 8812d973: am 7258650e: Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev

* commit '030493728e49edd9dcf4e3ed00d638cf5d6f318c':

commit | commitdiff | tree

Alexandra Gherghina [Mon, 27 Oct 2014 20:38:28 +0000 (20:38 +0000)]

am f91fee3b: am 4bda5d6e: am eac7cc5e: Merge "Add null check for sync authorities of an account type" into lmp-dev

* commit 'f91fee3b8b0b5373c31e6b7623d96254f682d82d':

commit | commitdiff | tree

Jeff Sharkey [Mon, 27 Oct 2014 20:38:27 +0000 (20:38 +0000)]

am 52ac1f48: am 7c8e4870: am d642d1ab: Merge "Include reason when wiping data." into lmp-dev

* commit '52ac1f48859db5bb7f43d17c7293aa5969e07994':

commit | commitdiff | tree

Paul Lawrence [Mon, 27 Oct 2014 20:38:26 +0000 (20:38 +0000)]

am 5dc635be: am 7af02e13: am 29df3796: Merge "Hide controls once password is known good" into lmp-dev

* commit '5dc635be37840a789e8f91e2307a2de934b29951':

commit | commitdiff | tree

Adrian Roos [Mon, 27 Oct 2014 20:38:25 +0000 (20:38 +0000)]

am b1a06720: am 98d94401: am 6d5c75f6: Prevent saving credentials multiple times

* commit 'b1a06720eb314ab0a03f2bc5d968a2a034b97e95':

commit | commitdiff | tree

Alan Viverette [Mon, 27 Oct 2014 20:38:24 +0000 (20:38 +0000)]

am 60b2b075: am c0277ea2: am c394e380: am 3156e38f: Merge "Fix background colors to point directly to theme attribute" into lmp-dev

* commit '60b2b075d4bac086b91f18ebad1ab58cb956908c':

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 27 Oct 2014 20:38:23 +0000 (20:38 +0000)]

am 58bb42f1: am 8c3f35a6: am 5fe578d8: am a1c6a0c8: Merge "Fix bug #17594602 Battery Usage refresh icon needs updating" into lmp-dev

* commit '58bb42f1d9b136cec69d411f0f875266cd09cb6d':

commit | commitdiff | tree

vandwalle [Mon, 27 Oct 2014 20:38:22 +0000 (20:38 +0000)]

am 18376c10: am 7cc43f77: am 0490e707: am 3962f171: Merge "correctly report DHCP failures" into lmp-dev

* commit '18376c10ff7d7b79c109c1fa57cc843ae63d9632':

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 27 Oct 2014 20:38:21 +0000 (20:38 +0000)]

am 77bbe567: am f931c6db: am b517f4c5: am 575a4d2a: Merge "Fix bug #17624121 Settings crash while launching on wiped device" into lmp-dev

* commit '77bbe567f5178a56f08139c1295c9984017437ad':

commit | commitdiff | tree

PauloftheWest [Mon, 27 Oct 2014 20:38:20 +0000 (20:38 +0000)]

am aca87588: am a50ef37d: am 34f78835: am 3b04714b: Merge "Fixed a Settings crash when exiting Wi-Fi Settings." into lmp-dev

* commit 'aca87588e1e9ea8fa8d44568d57833abe8c30ebd':

commit | commitdiff | tree

John Spurlock [Mon, 27 Oct 2014 20:38:19 +0000 (20:38 +0000)]

am e31575db: am 87fdccdc: am f1a24609: am 7e905488: Settings: Wire up new zen events config option.

* commit 'e31575db867c3074609dadda54656ca2a9514396':

commit | commitdiff | tree

Baligh Uddin [Mon, 27 Oct 2014 20:38:18 +0000 (20:38 +0000)]

am 59231820: (-s ours) am f6cb6bab: (-s ours) am acbd8195: (-s ours) am 2bfd4a5f: (-s ours) Import translations. DO NOT MERGE

* commit '59231820ffac3e6ac18b5fd6a4b8e642f2721165':

commit | commitdiff | tree

PauloftheWest [Mon, 27 Oct 2014 20:38:16 +0000 (20:38 +0000)]

am e8bdd136: am 6ff1b3d3: am c43b84e3: am 27dcfbbd: Merge "Fixed a Bluetooth discovery bug." into lmp-dev

* commit 'e8bdd136a6fa44425e267a9bb350eda15a206ad8':

commit | commitdiff | tree

PauloftheWest [Mon, 27 Oct 2014 20:38:15 +0000 (20:38 +0000)]

am a5f72825: am 55d5d83f: am 8f771c1f: am 1977342e: Merge "Fixed Settings Cellular Networks crash." into lmp-dev

* commit 'a5f72825a8b27e82a118baa9fbc64e3797f4ac63':

commit | commitdiff | tree

Baligh Uddin [Mon, 27 Oct 2014 20:38:14 +0000 (20:38 +0000)]

am 76e39afa: (-s ours) am 85c06226: (-s ours) am 3cf09bfe: (-s ours) am f015d47c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '76e39afa5b73e2ee788cab947af447404419f723':

commit | commitdiff | tree

Svetoslav [Mon, 27 Oct 2014 20:38:13 +0000 (20:38 +0000)]

am d4f7908a: am c269be39: am e7416dbe: am 1154caa8: Merge "Crash in Settings cancelling a print job from the job list." into lmp-dev

* commit 'd4f7908a9816ab6b8bb4e6b41643bb8a1475ff07':

commit | commitdiff | tree

Vinit Deshpande [Mon, 27 Oct 2014 20:38:12 +0000 (20:38 +0000)]

am 9ff006b4: am 33812f49: am 749c39f0: am 9a8c58d4: Merge "Fix automatic Wi-fi toggle" into lmp-dev

* commit '9ff006b42127175e3c40cbaafe09f3262f66f057':

commit | commitdiff | tree

Zoltan Szatmary-Ban [Mon, 27 Oct 2014 20:38:11 +0000 (20:38 +0000)]

am ab36fd98: am f8935010: am ddcb808b: am 6e1d8277: Merge "Show Power usage details for the correct user" into lmp-dev

* commit 'ab36fd983d77bb018dcbcf1e548409416ec014a1':

commit | commitdiff | tree

Matthew Xie [Mon, 27 Oct 2014 20:38:10 +0000 (20:38 +0000)]

am 631dd2ea: am 231a8128: am 68f3653e: am 72c34e6a: Merge "Do not overwrite alias with device name" into lmp-dev

* commit '631dd2ea58bbb1729b169ec66dfefa1cd3dcbdd6':

commit | commitdiff | tree

PauloftheWest [Mon, 27 Oct 2014 20:38:09 +0000 (20:38 +0000)]

am 0c32b376: am 58da4c37: am c932957d: am 0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev

* commit '0c32b376b81328de2c60c2cfcc6cd7e81dfdb4e0':

commit | commitdiff | tree

Sander Alewijnse [Mon, 27 Oct 2014 20:38:08 +0000 (20:38 +0000)]

am ef888ead: am 0fe16796: am c995e733: am 4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev

* commit 'ef888ead0d90231649f799f3424b1e3a14aee62f':

commit | commitdiff | tree

Mark Salyzyn [Mon, 27 Oct 2014 20:38:07 +0000 (20:38 +0000)]

am 54d56e6b: am 22955813: am 5f288bc1: am 894af268: logd: settings: ro.config.low_ram support

* commit '54d56e6bb325c07abf63eef9607b342bd9a58ddf':

commit | commitdiff | tree

Amith Yamasani [Mon, 27 Oct 2014 20:38:06 +0000 (20:38 +0000)]

am 84af5ffd: am 2f8b4173: am ae2da7a9: am 69b67465: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev

* commit '84af5ffd89ffdd9a695adb2dfdc3c7d4954c97b8':

commit | commitdiff | tree

John Spurlock [Mon, 27 Oct 2014 20:38:05 +0000 (20:38 +0000)]

am 96cd9251: am ab4fe2d9: am 9e51261d: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev

* commit '96cd925174f6c678b4242ccd4d8b5ccee94a81fc':

commit | commitdiff | tree

PauloftheWest [Mon, 27 Oct 2014 20:38:03 +0000 (20:38 +0000)]

am 4a62d8e6: am 63f9500e: am 08183704: am 3cc81aea: Increase char limit for translation.

* commit '4a62d8e69f095b301ff323fba7bd87111cfb6c73':

commit | commitdiff | tree

Maurice Lam [Mon, 27 Oct 2014 20:38:02 +0000 (20:38 +0000)]

am 69ea67b6: am 2ffb10d2: am fd4e0f25: am 27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev

* commit '69ea67b60ada436ace48ddf89539fb852d98e3ec':

commit | commitdiff | tree

Baligh Uddin [Mon, 27 Oct 2014 20:38:01 +0000 (20:38 +0000)]

am 70aabfde: (-s ours) am fbb0218a: (-s ours) am 1741abb9: (-s ours) am 09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '70aabfde6136de5684d6818728c5e41128f9a895':

commit | commitdiff | tree

PauloftheWest [Mon, 27 Oct 2014 20:38:00 +0000 (20:38 +0000)]

am a186ce83: am d1cd913a: am 9007cf63: am ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev

* commit 'a186ce831f3f346a302ca1d3e69b4cbad9687610':

commit | commitdiff | tree

Edward Jee [Mon, 27 Oct 2014 20:37:59 +0000 (20:37 +0000)]

am 6fc08883: am 000dd0a6: am a99ef887: am ac8b5b7f: Migrates PBAP and MAP access permission data from Settings to Bluetooth.

* commit '6fc08883cebe328fd92f289502cfb73fe3c29f5a':

commit | commitdiff | tree

Edward Jee [Mon, 27 Oct 2014 20:37:58 +0000 (20:37 +0000)]

am cea371ca: am 32c56ed4: am 50b6eec9: am b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev

* commit 'cea371caf2db6d0d5180e0dcf4100cf631aa3444':

commit | commitdiff | tree

PauloftheWest [Mon, 27 Oct 2014 20:37:57 +0000 (20:37 +0000)]

am 20cb5d91: am 8dee66d1: am 720af580: am 0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev

* commit '20cb5d910138877b312c13f22385792402ac2c4a':

commit | commitdiff | tree

Dianne Hackborn [Mon, 27 Oct 2014 20:37:56 +0000 (20:37 +0000)]

am b453421f: am 2acec676: am bf4ecab3: am 94aae9af: Little more on issue #17495264: tweak when we ignore initial times.

* commit 'b453421f92c0b43518cf15c9785c5dd4877225fc':

commit | commitdiff | tree

Dianne Hackborn [Mon, 27 Oct 2014 20:37:54 +0000 (20:37 +0000)]

am 6a300d00: am ff966f2a: am 829b9975: am ecffbc91: Merge "Fix issue #17495264: Battery history graph is bad" into lmp-dev

* commit '6a300d00aab43f123ace45e2fc70a573ab53d635':

commit | commitdiff | tree

Maurice Lam [Mon, 27 Oct 2014 20:37:53 +0000 (20:37 +0000)]

am 6476e981: am ea8db10a: am 0d09c6c1: am 795511ec: [WifiSetup] Disable app starting window

* commit '6476e98139459e49be4547d2cbcdf8087ef8d219':

commit | commitdiff | tree

PauloftheWest [Mon, 27 Oct 2014 20:37:52 +0000 (20:37 +0000)]

am c956628c: am f1fc7219: am 24233660: am 13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev

* commit 'c956628c74b29078fb4a80352ac4080278e830c3':

commit | commitdiff | tree

Geoff Mendal [Mon, 27 Oct 2014 20:37:51 +0000 (20:37 +0000)]

am 56e62487: (-s ours) Import translations. DO NOT MERGE automerge: f571e51 -s ours

* commit '56e6248737ba2d090fc4826c5eb265a29776670d':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Svetoslav [Mon, 27 Oct 2014 18:53:12 +0000 (18:53 +0000)]

am c8a1bb5a: am 3ea423ae: User to confirm credentials if an accessibility service changes encryption.

* commit 'c8a1bb5a4d069ac08196287e4853cb18fd723086':

commit | commitdiff | tree

Geoff Mendal [Mon, 27 Oct 2014 18:53:11 +0000 (18:53 +0000)]

am d33f7d6a: (-s ours) am 4909c412: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'd33f7d6a6201edb0f15f25511c9c3323b67a295a':

commit | commitdiff | tree

Jim Miller [Mon, 27 Oct 2014 18:53:10 +0000 (18:53 +0000)]

am 9afd56e0: am 46c7f6d6: Add a checkbox option to \'require password to decrypt\'

* commit '9afd56e08d872c6786cd622488c926e6b7a5524a':

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 27 Oct 2014 18:53:09 +0000 (18:53 +0000)]

am 84ff9901: am 94dce761: Merge "Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity" into lmp-dev

* commit '84ff9901341c1bad328f6e4d552e308f22d4d3c2':

commit | commitdiff | tree

Jason Monk [Mon, 27 Oct 2014 18:53:08 +0000 (18:53 +0000)]

am 8b1fe3b8: am eaf84472: Merge "Update screen pinning strings to say Overview" into lmp-dev

* commit '8b1fe3b8e0193748d319d5b0b4a375586bab1379':

commit | commitdiff | tree

Andres Morales [Mon, 27 Oct 2014 18:53:07 +0000 (18:53 +0000)]

am 4a9b3cf5: am 26bc6907: Merge "Set layout_width in WiFi+NFC resource" into lmp-dev

* commit '4a9b3cf50605d8e074e51166c49dbebcdcad1f75':

commit | commitdiff | tree

vandwalle [Mon, 27 Oct 2014 18:53:06 +0000 (18:53 +0000)]

am 60790f7b: am 2fb9c773: Merge "dont show a config in saved network if it is self added and we never connected to it Bug:17939405" into lmp-dev

* commit '60790f7b2a07c9ae79df6d8f1d02974e676791b7':

commit | commitdiff | tree

Geoff Mendal [Mon, 27 Oct 2014 18:53:05 +0000 (18:53 +0000)]

am a9cd186c: (-s ours) am e4d510fa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'a9cd186c9491ec56b9c3ea0fe9f7dbad00b8fad1':

commit | commitdiff | tree

John Spurlock [Mon, 27 Oct 2014 18:53:04 +0000 (18:53 +0000)]

am b3ce7874: am a312f7f8: Fix battery-history-chart large-mode labels in RTL layouts.

* commit 'b3ce7874ff4c887f37532fbff31e4c2659ca9d4c':

commit | commitdiff | tree

Alan Viverette [Mon, 27 Oct 2014 18:53:03 +0000 (18:53 +0000)]

am 673e3c28: am 178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev

* commit '673e3c28f4c9860f452d421028cc60af08208437':

commit | commitdiff | tree

Amit Mahajan [Mon, 27 Oct 2014 18:53:02 +0000 (18:53 +0000)]

am 6f451050: am 88b2790d: Merge "Fix to show signal strength as 0 if out of service." into lmp-dev

* commit '6f451050a77b8535ed00d06beddaa2eeb2488f2c':

commit | commitdiff | tree

Dianne Hackborn [Mon, 27 Oct 2014 18:53:01 +0000 (18:53 +0000)]

am df8683d2: am a4204bde: Merge "Update to use "real" L codename." into lmp-dev

* commit 'df8683d237f3a4b2e82e051d7c794ec3a744a736':

commit | commitdiff | tree

Zoltan Szatmary-Ban [Mon, 27 Oct 2014 18:52:59 +0000 (18:52 +0000)]

am 4ce8802e: am 50263efb: Remove CA Cert UI item from one list only

* commit '4ce8802e410c8f18d37f20188adab30395ceb440':

commit | commitdiff | tree

Amith Yamasani [Mon, 27 Oct 2014 18:52:58 +0000 (18:52 +0000)]

am 195b1583: am 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev

* commit '195b15833cb2db872980272d5c75ea33ab8c791d':

commit | commitdiff | tree

Geoff Mendal [Mon, 27 Oct 2014 18:52:57 +0000 (18:52 +0000)]

am 185e1722: (-s ours) am 7096c2dd: (-s ours) Import translations. DO NOT MERGE

* commit '185e17221a54f8c201d27d291a30f01f1f7641dd':

commit | commitdiff | tree

Baligh Uddin [Mon, 27 Oct 2014 18:52:56 +0000 (18:52 +0000)]

am bbf9927b: (-s ours) am 43848de1: (-s ours) Import translations. DO NOT MERGE

* commit 'bbf9927b1bdc3767c73efee1daf0019374ede021':

commit | commitdiff | tree

Svetoslav [Mon, 27 Oct 2014 18:52:55 +0000 (18:52 +0000)]

am b792f69e: am 5cdd3f4f: Update accessibility plus secure lock warning messages.

* commit 'b792f69eb416a0c6ac15d81413eef6c6e97fb1eb':

commit | commitdiff | tree

John Spurlock [Mon, 27 Oct 2014 18:52:54 +0000 (18:52 +0000)]

am 041ebc1b: am c05b739c: Merge "Settings: Update media & alarm stream icons." into lmp-dev

* commit '041ebc1bfc669da45eb3a36db1c221b3ce39abb4':

commit | commitdiff | tree

PauloftheWest [Mon, 27 Oct 2014 18:52:53 +0000 (18:52 +0000)]

am d005440f: am 6e26427e: Updated Wi-Fi hotspot dialog to the Material Spec.

* commit 'd005440fa9162f4e7c6e4664ae1db74fb624ec98':

commit | commitdiff | tree

PauloftheWest [Mon, 27 Oct 2014 18:52:51 +0000 (18:52 +0000)]

am 324f29c8: am 59d33dbd: Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev

* commit '324f29c86db2e746ec5fc41ddd0b81444e6bf76c':

commit | commitdiff | tree

Alan Viverette [Mon, 27 Oct 2014 18:52:50 +0000 (18:52 +0000)]

am dc174c85: am 7a4d229d: Merge "Ensure recycled APN preferences are updated to show radio button" into lmp-dev

* commit 'dc174c8593063aa11a8a3777e6b70a646f0c0ef3':

commit | commitdiff | tree

Baligh Uddin [Mon, 27 Oct 2014 18:52:49 +0000 (18:52 +0000)]

am ee3d7127: (-s ours) am 9d4dc326: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'ee3d7127cf0e2c6952a75947989378f29db170aa':

commit | commitdiff | tree

Hui Shu [Mon, 27 Oct 2014 18:52:48 +0000 (18:52 +0000)]

am bbb8928a: am 905f9e2f: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev

* commit 'bbb8928a4fa0f7b3e344f3d353e7aee13372f00b':

commit | commitdiff | tree

Zoltan Szatmary-Ban [Mon, 27 Oct 2014 18:52:47 +0000 (18:52 +0000)]

am 9cb9286d: am b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev

* commit '9cb9286dc246f54743913b1ae20c045e49810c49':

commit | commitdiff | tree

Maurice Lam [Mon, 27 Oct 2014 18:52:46 +0000 (18:52 +0000)]

am 001d8540: am f7b56708: Merge "[WifiSetup] Update background texture" into lmp-dev

* commit '001d85406847efeb54f7e7edb4233f68ea47c7dc':

commit | commitdiff | tree

Svetoslav [Mon, 27 Oct 2014 18:52:45 +0000 (18:52 +0000)]

am 6b5b77d2: am 52448442: Use default encryption password if an accessibility service is enabled.

* commit '6b5b77d2acc38117f914ad02cbd4de2da9dea73c':

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 27 Oct 2014 18:52:44 +0000 (18:52 +0000)]

am ca99afb5: am fc14e272: Merge "Update Settings App icons" into lmp-dev

* commit 'ca99afb57ae7d369c1f94ec2d67dc66a0e33d83c':