OSDN Git Service
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':
John Spurlock [Mon, 27 Oct 2014 18:52:06 +0000 (18:52 +0000)]
am
ab4fe2d9: am
9e51261d: am
ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
* commit '
ab4fe2d94fc1a0f142a390ef25ca64bc83fa17a0':
PauloftheWest [Mon, 27 Oct 2014 18:52:05 +0000 (18:52 +0000)]
am
63f9500e: am
08183704: am
3cc81aea: Increase char limit for translation.
* commit '
63f9500e0daae4b9aeda2bf4282bbe5dd8925b8e':
Maurice Lam [Mon, 27 Oct 2014 18:52:04 +0000 (18:52 +0000)]
am
2ffb10d2: am
fd4e0f25: am
27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
* commit '
2ffb10d28bd1945004bd29390803a81ce5bf3338':
Baligh Uddin [Mon, 27 Oct 2014 18:52:03 +0000 (18:52 +0000)]
am
fbb0218a: (-s ours) am
1741abb9: (-s ours) am
09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
fbb0218a117df5537f6ef2835a673ef485e1cdb1':
PauloftheWest [Mon, 27 Oct 2014 18:52:02 +0000 (18:52 +0000)]
am
d1cd913a: am
9007cf63: am
ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev
* commit '
d1cd913a6e1dc35da4d5e0c1fc4b48a0e382d486':
Edward Jee [Mon, 27 Oct 2014 18:52:00 +0000 (18:52 +0000)]
am
000dd0a6: am
a99ef887: am
ac8b5b7f: Migrates PBAP and MAP access permission data from Settings to Bluetooth.
* commit '
000dd0a6b24a8c383a2051201699bd2c93bc4159':
Edward Jee [Mon, 27 Oct 2014 18:51:59 +0000 (18:51 +0000)]
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 '
32c56ed434dbeec9cf2b0db62f43396d5b2a08d5':
PauloftheWest [Mon, 27 Oct 2014 18:51:58 +0000 (18:51 +0000)]
am
8dee66d1: am
720af580: am
0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev
* commit '
8dee66d1248af1aa28b32d11b1b3160ab3a79437':
Dianne Hackborn [Mon, 27 Oct 2014 18:51:57 +0000 (18:51 +0000)]
am
2acec676: am
bf4ecab3: am
94aae9af: Little more on issue #
17495264: tweak when we ignore initial times.
* commit '
2acec6768fc67516eff484f6d4f8de607a597a60':
Dianne Hackborn [Mon, 27 Oct 2014 18:51:56 +0000 (18:51 +0000)]
am
ff966f2a: am
829b9975: am
ecffbc91: Merge "Fix issue #
17495264: Battery history graph is bad" into lmp-dev
* commit '
ff966f2a82044bed1d9d791be9aa0c30c8bb26cc':
Maurice Lam [Mon, 27 Oct 2014 18:51:55 +0000 (18:51 +0000)]
am
ea8db10a: am
0d09c6c1: am
795511ec: [WifiSetup] Disable app starting window
* commit '
ea8db10ac8fc3aafd7834c401aacf7245b244936':
PauloftheWest [Mon, 27 Oct 2014 18:51:53 +0000 (18:51 +0000)]
am
f1fc7219: am
24233660: am
13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev
* commit '
f1fc7219298b5c8dd0bf5c695f3f3942289a05df':
Geoff Mendal [Mon, 27 Oct 2014 18:33:48 +0000 (18:33 +0000)]
Import translations. DO NOT MERGE
automerge:
f571e51 -s ours
* commit '
f571e511ba5ff6eb54c5d15de445a62614d5e00e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Oct 2014 16:43:16 +0000 (09:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia682e947ee01ba5ecc42b3a4578fcc010a7efead
Auto-generated-cl: translation import
Jim Miller [Sat, 25 Oct 2014 01:20:33 +0000 (01:20 +0000)]
am
500ecf26: am
dd932476: Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev
* commit '
500ecf26d15d75fa5baa8bc98ff61792fa858857':
Minor cleanup in EncryptionInterstitial
Jim Miller [Sat, 25 Oct 2014 01:09:05 +0000 (01:09 +0000)]
am
dd932476: Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev
* commit '
dd932476b92f9d0e7ef8617d32a1d49d830b6787':
Minor cleanup in EncryptionInterstitial
Jim Miller [Sat, 25 Oct 2014 01:01:16 +0000 (01:01 +0000)]
Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev
Michael Wright [Fri, 24 Oct 2014 23:27:51 +0000 (23:27 +0000)]
am
7f402457: am
ca6bc2ae: Skip Misc/Overcounted battery stats in release builds. automerge:
f7a5017 automerge:
95f29a1
* commit '
7f402457773721192d906af817db7256a4622e5e':
Skip Misc/Overcounted battery stats in release builds.
Michael Wright [Fri, 24 Oct 2014 23:03:44 +0000 (23:03 +0000)]
am
ca6bc2ae: Skip Misc/Overcounted battery stats in release builds. automerge:
f7a5017 automerge:
95f29a1
* commit '
ca6bc2aefad547d3ca3897b5ef8b8d5feafc7e2b':
Skip Misc/Overcounted battery stats in release builds.
Jim Miller [Fri, 24 Oct 2014 22:41:44 +0000 (15:41 -0700)]
Minor cleanup in EncryptionInterstitial
Fixes bug
18037481
Change-Id: I4e9dcc86a2d3db5c9311d5f743f03db19ca164e6
Michael Wright [Fri, 24 Oct 2014 22:33:50 +0000 (22:33 +0000)]
Skip Misc/Overcounted battery stats in release builds. automerge:
f7a5017
automerge:
95f29a1
* commit '
95f29a1930244b9978a55073326c9fb071c2615f':
Skip Misc/Overcounted battery stats in release builds.
Michael Wright [Fri, 24 Oct 2014 22:04:21 +0000 (22:04 +0000)]
Skip Misc/Overcounted battery stats in release builds.
automerge:
f7a5017
* commit '
f7a5017fa60d4cd3c802a45a7b04a4c8f34d969e':
Skip Misc/Overcounted battery stats in release builds.
Sanket Padawe [Fri, 24 Oct 2014 21:29:41 +0000 (21:29 +0000)]
Default sim name set to carrier name in sim settings automerge:
745046c
automerge:
8d60883
* commit '
8d60883ce4f10419c89282395277de60c25a7e4b':
Default sim name set to carrier name in sim settings
Michael Wright [Fri, 24 Oct 2014 21:25:49 +0000 (14:25 -0700)]
Skip Misc/Overcounted battery stats in release builds.
Bug:
18090734
Change-Id: I24d8eea9fcb0d0b9e50d512325ed91ce70eb16ac
Sanket Padawe [Fri, 24 Oct 2014 21:09:57 +0000 (21:09 +0000)]
Default sim name set to carrier name in sim settings
automerge:
745046c
* commit '
745046c15783880eb7e8559c5fb41f8c87e634b3':
Default sim name set to carrier name in sim settings
Sanket Padawe [Fri, 24 Oct 2014 18:15:11 +0000 (11:15 -0700)]
Default sim name set to carrier name in sim settings
Default sim name in SIM settings UI should be carrier name untill user
specifies a name for SIM.
Bug:
17732079
Change-Id: I302ad00095fd06b393dbe358b135f031390a3678
Sanket Padawe [Fri, 24 Oct 2014 18:44:16 +0000 (18:44 +0000)]
am
f6499e01: am
22eb414b: Set subscription id for "ask everytime" in sim settings
* commit '
f6499e01376208bdeb26f05d02b98d7d04d1a3fb':
Set subscription id for "ask everytime" in sim settings
Sanket Padawe [Fri, 24 Oct 2014 18:39:30 +0000 (18:39 +0000)]
am
22eb414b: Set subscription id for "ask everytime" in sim settings
* commit '
22eb414bbd0b1d4c988d71f97a24a9ff48f5cf9b':
Set subscription id for "ask everytime" in sim settings
Sanket Padawe [Fri, 24 Oct 2014 18:01:15 +0000 (11:01 -0700)]
Set subscription id for "ask everytime" in sim settings
Added default subscription id when user selects "Ask everytime"
while selecting sim card to select for phone calls.
Change-Id: I7f720f919850a85b65af648c9a7e078a0c05815e
Sanket Padawe [Fri, 24 Oct 2014 17:48:17 +0000 (17:48 +0000)]
am
844c2a77: am
7ff1718e: am
5fd97c55: Merge "WIP support icon" into lmp-sprout-dev
* commit '
844c2a77f44491ed8fec0e43919c4a3efae0acdf':
WIP support icon
Sanket Padawe [Fri, 24 Oct 2014 17:42:48 +0000 (17:42 +0000)]
am
7ff1718e: am
5fd97c55: Merge "WIP support icon" into lmp-sprout-dev
* commit '
7ff1718e1fb58b38ebfa4ec0d45e788c9acd2b5c':
WIP support icon
Sanket Padawe [Fri, 24 Oct 2014 17:39:21 +0000 (17:39 +0000)]
am
5fd97c55: Merge "WIP support icon" into lmp-sprout-dev
* commit '
5fd97c551fb8cbcc43d762d9c609be1061cc5170':
WIP support icon
Sanket Padawe [Fri, 24 Oct 2014 17:34:23 +0000 (17:34 +0000)]
Merge "WIP support icon" into lmp-sprout-dev
Sanket Padawe [Fri, 24 Oct 2014 17:17:08 +0000 (10:17 -0700)]
WIP support icon
Added static sim icon to alert box for selecting different sim accounts.
Change-Id: Ib22ceba4b96d636754d7946859f194488517ff9d
Baligh Uddin [Thu, 23 Oct 2014 22:24:11 +0000 (22:24 +0000)]
am
45ab2fe4: (-s ours) am
52e57d2d: (-s ours) am
cc5b08b6: (-s ours) am
8d7fdc61: (-s ours) Import translations. DO NOT MERGE
* commit '
45ab2fe400cc0b6e50c76239f1d40c5b5daaa9ec':
Import translations. DO NOT MERGE
Amith Yamasani [Thu, 23 Oct 2014 22:24:10 +0000 (22:24 +0000)]
am
95a5169d: am
0e64404a: am
526e4b41: am
c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev
* commit '
95a5169d564466a68ae13e28494f8cefe6153e2f':
Disable factory reset for secondary users
OSDN Git Service
