OSDN Git Service
Sanket Padawe [Thu, 30 Oct 2014 11:03:43 +0000 (11:03 +0000)]
am
4a1c5486: am
917aaf9e: Merge "Add sim color selection in settings" into lmp-mr1-dev
* commit '
4a1c5486b8d187ceb012954dc528bc8417c7cb3e':
Add sim color selection in settings
PauloftheWest [Thu, 30 Oct 2014 11:03:29 +0000 (11:03 +0000)]
am
22f257b0: am
93c10334: Merge "Added IMEI status activity." into lmp-mr1-dev
* commit '
22f257b091a444b0749e66faa4dc79fd24adacbf':
Added IMEI status activity.
Paul Lawrence [Thu, 30 Oct 2014 10:18:26 +0000 (10:18 +0000)]
am
be492644: am
00abeba2: Merge "Make emergency button right size" into lmp-mr1-dev
* commit '
be492644102083557fa47cde3ee9110826677079':
Make emergency button right size
Sanket Padawe [Tue, 28 Oct 2014 22:53:07 +0000 (22:53 +0000)]
am
917aaf9e: Merge "Add sim color selection in settings" into lmp-mr1-dev
* commit '
917aaf9ebd2893b9d0cebc2b08c4f7d814fa53c7':
Add sim color selection in settings
Sanket Padawe [Tue, 28 Oct 2014 22:48:33 +0000 (22:48 +0000)]
Merge "Add sim color selection in settings" into lmp-mr1-dev
PauloftheWest [Tue, 28 Oct 2014 22:48:29 +0000 (22:48 +0000)]
am
93c10334: Merge "Added IMEI status activity." into lmp-mr1-dev
* commit '
93c10334c8380b997554a02f6071b3bc620e7705':
Added IMEI status activity.
PauloftheWest [Tue, 28 Oct 2014 22:45:33 +0000 (22:45 +0000)]
Merge "Added IMEI status activity." into lmp-mr1-dev
Sanket Padawe [Tue, 28 Oct 2014 21:01:50 +0000 (14:01 -0700)]
Add sim color selection in settings
Adding a dropdown list to select sim color from sim settings UI.
Change-Id: I26da0a79f5b1edf829fc5d46af2c0c23962226b8
Paul Lawrence [Tue, 28 Oct 2014 20:14:31 +0000 (20:14 +0000)]
am
00abeba2: Merge "Make emergency button right size" into lmp-mr1-dev
* commit '
00abeba2c08b656db924d967a0733aa76aea40a7':
Make emergency button right size
Paul Lawrence [Tue, 28 Oct 2014 20:08:33 +0000 (20:08 +0000)]
Merge "Make emergency button right size" into lmp-mr1-dev
PauloftheWest [Mon, 20 Oct 2014 18:26:13 +0000 (11:26 -0700)]
Added IMEI status activity.
+ Added IMEI support from MTK with formatting changes. Now extra SIM
IMEI information is displayed in a seperate activity.
Bug:
17935115
Change-Id: I48942d77650bef2a1778996db3b1ec3a9d87492c
Jason Monk [Tue, 28 Oct 2014 19:41:15 +0000 (19:41 +0000)]
Merge "Allow QS to launch adding network dialog" into lmp-mr1-dev automerge:
496b3f6
automerge:
3caba72
* commit '
3caba72aa11c32daf3ad8ef0b8ba6a7e503c4b80':
Allow QS to launch adding network dialog
vandwalle [Tue, 28 Oct 2014 19:41:09 +0000 (19:41 +0000)]
Merge "prettify debug informations" into lmp-mr1-dev automerge:
10a4cac
automerge:
1260451
* commit '
12604519aac0b99733dc40c712d129f6c3f680d4':
prettify debug informations
Jason Monk [Tue, 28 Oct 2014 19:16:38 +0000 (19:16 +0000)]
Merge "Allow QS to launch adding network dialog" into lmp-mr1-dev
automerge:
496b3f6
* commit '
496b3f647186866703af1081d26a987069a468a8':
Allow QS to launch adding network dialog
vandwalle [Tue, 28 Oct 2014 19:16:31 +0000 (19:16 +0000)]
Merge "prettify debug informations" into lmp-mr1-dev
automerge:
10a4cac
* commit '
10a4cacc0f51a8d0e0f62be9375a3ca638b0ac4a':
prettify debug informations
Paul Lawrence [Tue, 28 Oct 2014 18:32:42 +0000 (11:32 -0700)]
Make emergency button right size
Bug:
18123894
Bug:
17394128
Change-Id: I248890b82f62146e1814172fd8b67e9a39661997
Jason Monk [Tue, 28 Oct 2014 18:45:24 +0000 (18:45 +0000)]
Merge "Allow QS to launch adding network dialog" into lmp-mr1-dev
vandwalle [Tue, 28 Oct 2014 18:34:32 +0000 (18:34 +0000)]
Merge "prettify debug informations" into lmp-mr1-dev
John Spurlock [Tue, 28 Oct 2014 18:07:57 +0000 (18:07 +0000)]
am
90674e53: Merge "Settings: Follow update to common conditions call." into lmp-mr1-dev
automerge:
22a466a
* commit '
22a466a82ebce42ae0b75c80226b10ab97f89321':
Settings: Follow update to common conditions call.
Alexandra Gherghina [Tue, 28 Oct 2014 18:02:14 +0000 (18:02 +0000)]
am
9f0bab9b: Merge "Close account settings if there\'s no account to show" into lmp-mr1-dev
automerge:
ffae7de
* commit '
ffae7de1ea79d147fcb30b54d23f4973d330a19b':
Close account settings if there's no account to show
Jason Monk [Mon, 27 Oct 2014 15:35:16 +0000 (11:35 -0400)]
Allow QS to launch adding network dialog
This allows QS to set an extra that will launch the adding network
dialog directly for a specified ssid. It will be used to take users
straight from QS to the password entry, when a secure network is
selected.
Bug:
17722817
Change-Id: I570596af906de005c505678b539f915c06e6fd14
John Spurlock [Tue, 28 Oct 2014 17:12:57 +0000 (17:12 +0000)]
am
90674e53: Merge "Settings: Follow update to common conditions call." into lmp-mr1-dev
* commit '
90674e53fc1fbac31f112fd6f11a5365cf66ec42':
Settings: Follow update to common conditions call.
John Spurlock [Tue, 28 Oct 2014 17:08:50 +0000 (17:08 +0000)]
Merge "Settings: Follow update to common conditions call." into lmp-mr1-dev
John Spurlock [Tue, 28 Oct 2014 15:25:37 +0000 (11:25 -0400)]
Settings: Follow update to common conditions call.
Bug:
16824863
Change-Id: I4a4e455b99e1c68a65c63bfd3a9972e57555825f
Alexandra Gherghina [Tue, 28 Oct 2014 15:35:36 +0000 (15:35 +0000)]
am
9f0bab9b: Merge "Close account settings if there\'s no account to show" into lmp-mr1-dev
* commit '
9f0bab9bcb756607da99758971207ad833c4608b':
Close account settings if there's no account to show
Alexandra Gherghina [Tue, 28 Oct 2014 15:29:37 +0000 (15:29 +0000)]
Merge "Close account settings if there's no account to show" into lmp-mr1-dev
Wink Saville [Mon, 27 Oct 2014 21:36:17 +0000 (21:36 +0000)]
am
4aab7ecb: Merge "Change subId to int from long" into lmp-mr1-dev
automerge:
cb02b97
* commit '
cb02b97f8dc972e0438492b1cadaa21b34a301b6':
Change subId to int from long
Geoff Mendal [Mon, 27 Oct 2014 21:36:10 +0000 (21:36 +0000)]
am
855f0d26: (-s ours) Import translations. DO NOT MERGE automerge:
c7df50c -s ours
automerge:
967c000 -s ours
* commit '
967c000603e40704008a094cce3f3348acab7cf8':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Oct 2014 21:35:59 +0000 (21:35 +0000)]
am
40f84ca0: (-s ours) Import translations. DO NOT MERGE
automerge:
9ab85cf -s ours
* commit '
9ab85cf0e01e2a96637c8a786a8df5fc5e0ccc65':
Import translations. DO NOT MERGE
Wink Saville [Mon, 27 Oct 2014 20:37:06 +0000 (20:37 +0000)]
am
4aab7ecb: Merge "Change subId to int from long" into lmp-mr1-dev
* commit '
4aab7ecb56e9af4600b126c67d7efe0b7e1f6ee1':
Change subId to int from long
Geoff Mendal [Mon, 27 Oct 2014 20:37:05 +0000 (20:37 +0000)]
am
855f0d26: (-s ours) Import translations. DO NOT MERGE automerge:
c7df50c -s ours
* commit '
855f0d264343325fb308bd27c509d7f95893d645':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Oct 2014 20:37:04 +0000 (20:37 +0000)]
am
40f84ca0: (-s ours) Import translations. DO NOT MERGE
* commit '
40f84ca02033ce62e301dd6d16fdc1f4b9a5326a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Oct 2014 18:53:20 +0000 (18:53 +0000)]
am
bf9175c0: (-s ours) am
795c8378: (-s ours) Import translations. DO NOT MERGE
* commit '
bf9175c03bb47cf85af809a21cd45cbc989ade63':
Baligh Uddin [Mon, 27 Oct 2014 18:53:19 +0000 (18:53 +0000)]
am
5b3f6a3a: (-s ours) am
25149b38: (-s ours) Import translations. DO NOT MERGE
* commit '
5b3f6a3a6d6f580784f4745d635b2abbe5d47618':
Jim Miller [Mon, 27 Oct 2014 18:53:18 +0000 (18:53 +0000)]
am
cd8971a9: am
aa037675: Fix bad string in EncryptionInterstitial
* commit '
cd8971a9e95ec918322e670af93e042c5587ea07':
Jim Miller [Mon, 27 Oct 2014 18:53:17 +0000 (18:53 +0000)]
am
7b13fe8f: am
47adff0a: Show warning dialog when Accessibility is enabled
* commit '
7b13fe8f907910868c46921e25f481909c80964f':
Jim Miller [Mon, 27 Oct 2014 18:53:16 +0000 (18:53 +0000)]
am
b72f97c0: am
602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev
* commit '
b72f97c0f18c08972997ddce481b8939566a135c':
Svetoslav [Mon, 27 Oct 2014 18:53:15 +0000 (18:53 +0000)]
am
fec94660: am
ba202e9f: Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev
* commit '
fec94660fb1b3ea76b49c52e1a6d0741e19bec2a':
Amith Yamasani [Mon, 27 Oct 2014 18:53:14 +0000 (18:53 +0000)]
am
2ae9f8ab: am
e52c159c: Fix some strings for the encryption stuff.
* commit '
2ae9f8aba61ce28bb3cdb38c915f2a1ccc33b811':
Jim Miller [Mon, 27 Oct 2014 18:53:13 +0000 (18:53 +0000)]
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
PauloftheWest [Mon, 27 Oct 2014 18:52:43 +0000 (18:52 +0000)]
Baligh Uddin [Mon, 27 Oct 2014 18:52:42 +0000 (18:52 +0000)]
am
08a08b34: (-s ours) am
5c664d8e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
08a08b344bdf3d6aab0fae6d943ceca391f1a697':
PauloftheWest [Mon, 27 Oct 2014 18:52:40 +0000 (18:52 +0000)]
am
6dfb48bf: am
709ddd5c: Merge "Fixed multiple MAP issues." into lmp-dev
* commit '
6dfb48bf48926c99dd5bdc7ff73425d683cdc0cb':
Robert Greenwalt [Mon, 27 Oct 2014 18:52:39 +0000 (18:52 +0000)]
am
4670af53: am
ce77a43a: Merge "ATT Entitlement changes in Settings to pass Tether Type." into lmp-dev
* commit '
4670af53272d9730d38ed2b548e6ca3d5381528f':
Elliott Hughes [Mon, 27 Oct 2014 18:52:38 +0000 (18:52 +0000)]
am
c9482dd9: am
ed6a6ca0: Make the system locale available to the decryption UI.
* commit '
c9482dd9d641b93ffee2dab76f96c996f02a863b':
Alexandra Gherghina [Mon, 27 Oct 2014 18:52:37 +0000 (18:52 +0000)]
am
e4b18b79: am
9de68440: Merge "Match parent width for user spinner to fix tint" into lmp-dev
* commit '
e4b18b79946571d3255a3226e996d1ba601d8269':
Alexandra Gherghina [Mon, 27 Oct 2014 18:52:36 +0000 (18:52 +0000)]
am
8e4be6af: am
3c3ceb9d: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev
* commit '
8e4be6afb4de5e634b319685a6b7a9ac3735c9d0':
PauloftheWest [Mon, 27 Oct 2014 18:52:35 +0000 (18:52 +0000)]
am
2af51dbc: am
3aabfca4: Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev
* commit '
2af51dbcfe43ed29da6efd1b903d7c8501c47e5b':
Michael Wright [Mon, 27 Oct 2014 18:52:34 +0000 (18:52 +0000)]
am
2e0d4080: am
1b87bec5: Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev
* commit '
2e0d4080ee72f86ca4f09335d7476b24c24e3ab4':
Zoltan Szatmary-Ban [Mon, 27 Oct 2014 18:52:33 +0000 (18:52 +0000)]
am
2d9cbcea: am
a2b7bb6b: Merge "Make Force Stop button work for packages of managed profile" into lmp-dev
* commit '
2d9cbcea0312dd93260b652d78a7abfd46c54a6c':
Zoltan Szatmary-Ban [Mon, 27 Oct 2014 18:52:32 +0000 (18:52 +0000)]
am
8812d973: am
7258650e: Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev
* commit '
8812d973938dea23d6a5ef37c3bd310bd5e0752b':
Alexandra Gherghina [Mon, 27 Oct 2014 18:52:31 +0000 (18:52 +0000)]
am
4bda5d6e: am
eac7cc5e: Merge "Add null check for sync authorities of an account type" into lmp-dev
* commit '
4bda5d6e2554fd4883b8599271a7d3a3872b4e7c':
Jeff Sharkey [Mon, 27 Oct 2014 18:52:30 +0000 (18:52 +0000)]
am
7c8e4870: am
d642d1ab: Merge "Include reason when wiping data." into lmp-dev
* commit '
7c8e48703bc566e075d8bce93fd6511f70e7d86d':
Paul Lawrence [Mon, 27 Oct 2014 18:52:29 +0000 (18:52 +0000)]
am
7af02e13: am
29df3796: Merge "Hide controls once password is known good" into lmp-dev
* commit '
7af02e13bfbd5d9d48ee78937349e7d7ab17c60b':
Adrian Roos [Mon, 27 Oct 2014 18:52:27 +0000 (18:52 +0000)]
am
98d94401: am
6d5c75f6: Prevent saving credentials multiple times
* commit '
98d94401fa795102c4909ee6a590cad51fa098d5':
Alan Viverette [Mon, 27 Oct 2014 18:52:26 +0000 (18:52 +0000)]
am
c0277ea2: am
c394e380: am
3156e38f: Merge "Fix background colors to point directly to theme attribute" into lmp-dev
* commit '
c0277ea2cf7dc06ebdc54eb4b1e851b78b951256':
Fabrice Di Meglio [Mon, 27 Oct 2014 18:52:25 +0000 (18:52 +0000)]
am
8c3f35a6: am
5fe578d8: am
a1c6a0c8: Merge "Fix bug #
17594602 Battery Usage refresh icon needs updating" into lmp-dev
* commit '
8c3f35a659890fdd13a0c4da0b0a0b70a3d4b53b':
vandwalle [Mon, 27 Oct 2014 18:52:24 +0000 (18:52 +0000)]
am
7cc43f77: am
0490e707: am
3962f171: Merge "correctly report DHCP failures" into lmp-dev
* commit '
7cc43f77184007c339c1202e5f5519ceafa30a7b':
Fabrice Di Meglio [Mon, 27 Oct 2014 18:52:23 +0000 (18:52 +0000)]
am
f931c6db: am
b517f4c5: am
575a4d2a: Merge "Fix bug #
17624121 Settings crash while launching on wiped device" into lmp-dev
* commit '
f931c6db857e2898f9c558acef8358d29130d139':
PauloftheWest [Mon, 27 Oct 2014 18:52:22 +0000 (18:52 +0000)]
am
a50ef37d: am
34f78835: am
3b04714b: Merge "Fixed a Settings crash when exiting Wi-Fi Settings." into lmp-dev
* commit '
a50ef37de82ff3aa574230fc9c0027159a318048':
John Spurlock [Mon, 27 Oct 2014 18:52:21 +0000 (18:52 +0000)]
am
87fdccdc: am
f1a24609: am
7e905488: Settings: Wire up new zen events config option.
* commit '
87fdccdc5706856d5ee9a474205e1d5b55db7634':
Baligh Uddin [Mon, 27 Oct 2014 18:52:20 +0000 (18:52 +0000)]
am
f6cb6bab: (-s ours) am
acbd8195: (-s ours) am
2bfd4a5f: (-s ours) Import translations. DO NOT MERGE
* commit '
f6cb6bab0b225c7bfe4f9ddd07b10877e5d93769':
PauloftheWest [Mon, 27 Oct 2014 18:52:18 +0000 (18:52 +0000)]
am
6ff1b3d3: am
c43b84e3: am
27dcfbbd: Merge "Fixed a Bluetooth discovery bug." into lmp-dev
* commit '
6ff1b3d37b16872b720a00f4faa8899834da347c':
PauloftheWest [Mon, 27 Oct 2014 18:52:17 +0000 (18:52 +0000)]
am
55d5d83f: am
8f771c1f: am
1977342e: Merge "Fixed Settings Cellular Networks crash." into lmp-dev
* commit '
55d5d83f38f9ee67f58eda25a378cb14f2d6f903':
Baligh Uddin [Mon, 27 Oct 2014 18:52:16 +0000 (18:52 +0000)]
am
85c06226: (-s ours) am
3cf09bfe: (-s ours) am
f015d47c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
85c0622678241addbc6be2f3fa2b1e20c90e61d9':
Svetoslav [Mon, 27 Oct 2014 18:52:15 +0000 (18:52 +0000)]
am
c269be39: am
e7416dbe: am
1154caa8: Merge "Crash in Settings cancelling a print job from the job list." into lmp-dev
* commit '
c269be392825341b29fa6b11047fc736e75580f2':
Vinit Deshpande [Mon, 27 Oct 2014 18:52:14 +0000 (18:52 +0000)]
am
33812f49: am
749c39f0: am
9a8c58d4: Merge "Fix automatic Wi-fi toggle" into lmp-dev
* commit '
33812f4934c3c8a0e2d3aeb3f89625bdc9777f55':
Zoltan Szatmary-Ban [Mon, 27 Oct 2014 18:52:13 +0000 (18:52 +0000)]
am
f8935010: am
ddcb808b: am
6e1d8277: Merge "Show Power usage details for the correct user" into lmp-dev
* commit '
f893501081fa2090315b70bd96ac6f5d1499b8dd':
Matthew Xie [Mon, 27 Oct 2014 18:52:12 +0000 (18:52 +0000)]
am
231a8128: am
68f3653e: am
72c34e6a: Merge "Do not overwrite alias with device name" into lmp-dev
* commit '
231a81282a9ac8fcfb4f42c5819181c78e3b133d':
PauloftheWest [Mon, 27 Oct 2014 18:52:11 +0000 (18:52 +0000)]
am
58da4c37: am
c932957d: am
0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev
* commit '
58da4c37276ba1102a4a524b2a56c0b5db0e477f':
Sander Alewijnse [Mon, 27 Oct 2014 18:52:09 +0000 (18:52 +0000)]
am
0fe16796: am
c995e733: am
4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev
* commit '
0fe16796c55091ed7b75f75fdeed5b0e5b03da30':
Mark Salyzyn [Mon, 27 Oct 2014 18:52:08 +0000 (18:52 +0000)]
am
22955813: am
5f288bc1: am
894af268: logd: settings: ro.config.low_ram support
* commit '
229558137318fdebce6b1bf3f5b30ea96e65a400':
Amith Yamasani [Mon, 27 Oct 2014 18:52:07 +0000 (18:52 +0000)]
am
2f8b4173: am
ae2da7a9: am
69b67465: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev
* commit '
2f8b4173581bb7a7421f6c49dee236cdebc66aaf':
OSDN Git Service
