OSDN Git Service
Edward Jee [Wed, 17 Sep 2014 05:13:04 +0000 (05:13 +0000)]
am
69010fb1: am
ea9c43ca: am
299faadb: am
b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev
* commit '
69010fb13af1de42e17e78772c5f85bb1fa28374':
Do not show phonebook access permission dialog if pairing dialog has already been shown.
PauloftheWest [Wed, 17 Sep 2014 05:13:02 +0000 (05:13 +0000)]
am
3724edb3: am
f4713e0f: am
99f7d73b: am
0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev
* commit '
3724edb357230c226f1c2b21c5795a97281022f3':
Removed all references to "Google Wi-Fi Assistant" from Settings.
Dianne Hackborn [Wed, 17 Sep 2014 05:13:01 +0000 (05:13 +0000)]
am
4e2f9ca6: am
99b1261c: am
9e4b5269: am
94aae9af: Little more on issue #
17495264: tweak when we ignore initial times.
* commit '
4e2f9ca6dbdc28a3d38ee5f0491a094431a9b509':
Little more on issue #
17495264: tweak when we ignore initial times.
Dianne Hackborn [Wed, 17 Sep 2014 05:13:00 +0000 (05:13 +0000)]
am
5df5798e: am
6d9988e7: am
ebcba9dc: am
ecffbc91: Merge "Fix issue #
17495264: Battery history graph is bad" into lmp-dev
* commit '
5df5798e619a9a73946c4b0ce61cd366e5a9f90b':
Fix issue #
17495264: Battery history graph is bad
Maurice Lam [Wed, 17 Sep 2014 05:12:58 +0000 (05:12 +0000)]
am
9bfbf642: am
24956de0: am
95b283aa: am
795511ec: [WifiSetup] Disable app starting window
* commit '
9bfbf6426bff4c7b8b074f0701dbf539b6c34b51':
[WifiSetup] Disable app starting window
PauloftheWest [Tue, 16 Sep 2014 21:03:12 +0000 (21:03 +0000)]
am
9de624d8: am
7b03a452: am
dc985292: am
13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev
* commit '
9de624d837513b4650f973d609006b03140f5507':
Updated Wi-Fi Settings icons to new filled-in teal format.
Prem Kumar [Tue, 16 Sep 2014 20:32:54 +0000 (20:32 +0000)]
am
02f66ba7: am
07e5ea99: am
319e7a27: am
c0deb7da: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev
* commit '
02f66ba78c67567275fca7fd994a9d3df023befe':
John Spurlock [Tue, 16 Sep 2014 20:31:48 +0000 (20:31 +0000)]
am
c9f6945f: am
be0827dd: am
f97ec546: am
2e205e9b: Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev
* commit '
c9f6945fc80511de36c6e7029b49a0d322b9aaa5':
Tyler Gunn [Tue, 16 Sep 2014 20:29:45 +0000 (20:29 +0000)]
Edward Jee [Tue, 16 Sep 2014 17:18:15 +0000 (17:18 +0000)]
am
ea9c43ca: am
299faadb: am
b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev
* commit '
ea9c43ca6503d6bd57f7258341a41a664c7a7cee':
Do not show phonebook access permission dialog if pairing dialog has already been shown.
PauloftheWest [Tue, 16 Sep 2014 17:18:15 +0000 (17:18 +0000)]
am
f4713e0f: am
99f7d73b: am
0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev
* commit '
f4713e0fad08dbcde9b61ad2bf8ec646d8022c14':
Removed all references to "Google Wi-Fi Assistant" from Settings.
Dianne Hackborn [Tue, 16 Sep 2014 17:18:14 +0000 (17:18 +0000)]
am
99b1261c: am
9e4b5269: am
94aae9af: Little more on issue #
17495264: tweak when we ignore initial times.
* commit '
99b1261c1f0ea0e71d41014e6fdddbf3f1912bcb':
Little more on issue #
17495264: tweak when we ignore initial times.
Dianne Hackborn [Tue, 16 Sep 2014 17:18:13 +0000 (17:18 +0000)]
am
6d9988e7: am
ebcba9dc: am
ecffbc91: Merge "Fix issue #
17495264: Battery history graph is bad" into lmp-dev
* commit '
6d9988e79ec5b8d1480f50e45fe58e358574115b':
Fix issue #
17495264: Battery history graph is bad
Maurice Lam [Tue, 16 Sep 2014 17:18:12 +0000 (17:18 +0000)]
am
24956de0: am
95b283aa: am
795511ec: [WifiSetup] Disable app starting window
* commit '
24956de0e0405ee3165d289ce74a87e70855b46b':
[WifiSetup] Disable app starting window
Edward Jee [Tue, 16 Sep 2014 16:47:34 +0000 (16:47 +0000)]
am
299faadb: am
b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev
* commit '
299faadbfc73f62ed0e8be968d62a42daf203e87':
Do not show phonebook access permission dialog if pairing dialog has already been shown.
PauloftheWest [Tue, 16 Sep 2014 16:47:33 +0000 (16:47 +0000)]
am
99f7d73b: am
0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev
* commit '
99f7d73b4722b196ba66d9e70741db0ced53b3c9':
Removed all references to "Google Wi-Fi Assistant" from Settings.
Dianne Hackborn [Tue, 16 Sep 2014 16:47:32 +0000 (16:47 +0000)]
am
9e4b5269: am
94aae9af: Little more on issue #
17495264: tweak when we ignore initial times.
* commit '
9e4b526951eaccc4aeb1d85a5d9e52a996a7b1d0':
Little more on issue #
17495264: tweak when we ignore initial times.
Dianne Hackborn [Tue, 16 Sep 2014 16:47:31 +0000 (16:47 +0000)]
am
ebcba9dc: am
ecffbc91: Merge "Fix issue #
17495264: Battery history graph is bad" into lmp-dev
* commit '
ebcba9dca7290cf1e4f1d263408f1af98b89a853':
Fix issue #
17495264: Battery history graph is bad
Maurice Lam [Tue, 16 Sep 2014 16:47:30 +0000 (16:47 +0000)]
am
95b283aa: am
795511ec: [WifiSetup] Disable app starting window
* commit '
95b283aabd26a757bc80abf6beff36346d15b20b':
[WifiSetup] Disable app starting window
Paul Lawrence [Tue, 16 Sep 2014 15:21:16 +0000 (15:21 +0000)]
am
36d8bd3b: am
db51c76a: am
7f4c4fb5: am
c64c9808: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
* commit '
36d8bd3bf7267f38af9f53be7bce70d93b5f3bfa':
Kenny Guy [Tue, 16 Sep 2014 15:21:15 +0000 (15:21 +0000)]
am
daa4a466: am
28d2fa62: am
1ede808c: am
db9e3f68: Merge "Fix crash when showing accounts." into lmp-dev
* commit '
daa4a46633cc1175a8dcb3a60fe968d088dee377':
Alexandra Gherghina [Tue, 16 Sep 2014 15:21:14 +0000 (15:21 +0000)]
am
7a09535c: am
cd321d81: am
69af2c6a: am
f738895d: Merge "Switch to using system-wide default user icons" into lmp-dev
* commit '
7a09535c734cb9da9dcf66bef8b5265f0f65882a':
PauloftheWest [Tue, 16 Sep 2014 15:21:13 +0000 (15:21 +0000)]
am
e438c383: am
6c1d69ba: am
9f96ac6f: am
37b1253a: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev
* commit '
e438c38323f9e3132110ab561235b766d5e800c0':
Dianne Hackborn [Tue, 16 Sep 2014 15:21:12 +0000 (15:21 +0000)]
am
f7acc1b3: am
c857cddf: am
364ca371: am
a5780340: Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev
* commit '
f7acc1b3115bee7536804ee77579eb213db67525':
Svetoslav [Tue, 16 Sep 2014 15:21:11 +0000 (15:21 +0000)]
am
0a91a8d2: am
c33aef20: am
c50841ca: am
85dcef12: Fix settings crash in print job screen.
* commit '
0a91a8d24dd7098d31410f14a36067a7fe963ff4':
Vinit Deshpande [Tue, 16 Sep 2014 15:21:10 +0000 (15:21 +0000)]
am
84912814: am
7aaccec0: am
c471629c: am
0a11f605: Merge "Don\'t require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev
* commit '
84912814f50934ddb8e6c968d829a00873037bb2':
Svetoslav [Tue, 16 Sep 2014 15:21:09 +0000 (15:21 +0000)]
am
9af0fce6: am
536cb798: am
842e9d04: am
72cfbcb4: Merge "Fix print icons in settings." into lmp-dev
* commit '
9af0fce66a9262c5563a588dbc998f451ca40469':
Carlos Valdivia [Tue, 16 Sep 2014 15:21:08 +0000 (15:21 +0000)]
am
4806e47d: am
456fbe88: am
a8627dd8: am
f79797c8: am
ea2fa0d9: am
db591467: am
737d2d53: am
61ced6d4: am
01137c20: am
663b4e97: am
37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
* commit '
4806e47d55ff4797ba2a93c1f94414219d5358cb':
Baligh Uddin [Tue, 16 Sep 2014 15:21:08 +0000 (15:21 +0000)]
am
2dd62886: (-s ours) am
f053f532: (-s ours) am
a2e918af: (-s ours) am
9b45212b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
2dd62886faea7b923aa1abaf4e5e7b681c400ba7':
Dan Sandler [Tue, 16 Sep 2014 15:21:07 +0000 (15:21 +0000)]
am
fecd8989: am
99e467a7: am
e98bee54: am
1fb51987: Merge "Show a better list of apps." into lmp-dev
* commit '
fecd8989854aaf09fd5f761ac863e116534e9177':
Zoltan Szatmary-Ban [Tue, 16 Sep 2014 15:21:06 +0000 (15:21 +0000)]
am
bc8f3d08: am
118cf516: am
55cd479d: am
cf911d10: Merge "Check for DeviceAdminInfo type before casting" into lmp-dev
* commit '
bc8f3d08d7572ebf51976806d7c1ad6f02cf3352':
Zoltan Szatmary-Ban [Tue, 16 Sep 2014 15:21:05 +0000 (15:21 +0000)]
am
23496243: am
b2259b3a: am
b46eeeb7: am
f572fdd1: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev
* commit '
2349624368f4e3fd1e2d6ec6fee2122354aa1a14':
Fabrice Di Meglio [Tue, 16 Sep 2014 15:21:04 +0000 (15:21 +0000)]
am
88ff5747: am
a2bba88b: am
b88d24df: am
f8310c18: Merge "Fix bug #
17459965 Take photo for Profile twice leads to "A resource was acquired at attached stack trace but never released" into lmp-dev
* commit '
88ff5747b67df59fd623b177a06bce86b5031fb8':
PauloftheWest [Tue, 16 Sep 2014 15:21:03 +0000 (15:21 +0000)]
am
08455c57: am
c1806600: am
23d0ac44: am
b2197d90: Added bluetooth_device_settings_header to fix build breakage.
* commit '
08455c5791f706f8d55cd08a96375a209597d5d5':
Jim Miller [Tue, 16 Sep 2014 15:21:02 +0000 (15:21 +0000)]
am
0787af48: am
825eb63c: am
f496ae94: am
ca03758e: Merge "Keep unlock attempt count after configuration change" into lmp-dev
* commit '
0787af48c7efa96ba3fa5a44b8686428e9f020a6':
Baligh Uddin [Tue, 16 Sep 2014 15:21:01 +0000 (15:21 +0000)]
am
c742cfc7: (-s ours) am
6f96fcc5: (-s ours) am
321b25a1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
c742cfc716bba4ee2bd6dbe62a42d182baa4b6bd':
Import translations. DO NOT MERGE
PauloftheWest [Tue, 16 Sep 2014 15:21:00 +0000 (15:21 +0000)]
am
52e19465: am
1675c786: Merge "Made Bluetooth device dialog fully scrollable." into lmp-dev
* commit '
52e1946554a45b6034bcf23ed46f3033fe843129':
John Spurlock [Tue, 16 Sep 2014 15:20:59 +0000 (15:20 +0000)]
am
315e0a4a: am
31915522: Settings: Remove fixed dropdown width from "From" pref.
* commit '
315e0a4a9e0a87972f7e5e8e850a226bdf90d83a':
PauloftheWest [Tue, 16 Sep 2014 15:20:58 +0000 (15:20 +0000)]
am
4708092e: am
8b7d27cb: Merge "Updated Bluetooth keyboard icon to teal." into lmp-dev
* commit '
4708092e4f1b9538ddd8e3fc797ad184eea78233':
Jason Monk [Tue, 16 Sep 2014 15:20:57 +0000 (15:20 +0000)]
Fabrice Di Meglio [Tue, 16 Sep 2014 15:20:56 +0000 (15:20 +0000)]
am
743400b4: am
877fb7fb: Merge "Fix bug #
17449527 On Profile info alert box, profile picture button is unlabeled in accessibility" into lmp-dev
* commit '
743400b466ad6459fe01a35596bf7478695cee57':
John Spurlock [Tue, 16 Sep 2014 15:20:55 +0000 (15:20 +0000)]
am
417b8261: am
1e7dbd45: Settings: Use the same day sequence for downtime.
* commit '
417b826176e1b88ef640518eaed639726a84e9ec':
John Spurlock [Tue, 16 Sep 2014 15:20:54 +0000 (15:20 +0000)]
am
0ed4f5b7: am
cddb2954: Settings: Make downtime days scrollable.
* commit '
0ed4f5b7b122f98a37c0cd1de0de9ccc55795a14':
Matthew Xie [Tue, 16 Sep 2014 15:20:52 +0000 (15:20 +0000)]
am
a5d4c1b2: am
72e5583d: Merge "Do not remove bonded devices from cached device list upon a device scan" into lmp-dev
* commit '
a5d4c1b2be158f08c0363dc7339d01b5845fd5bc':
Carlos Valdivia [Tue, 16 Sep 2014 15:20:51 +0000 (15:20 +0000)]
am
cece1cb2: am
af85b740: Merge "SECURITY: Prevent preference intents from exploiting settings." into lmp-dev
* commit '
cece1cb20899394cd1710f5d02aa7fdacedaf653':
Elliott Hughes [Tue, 16 Sep 2014 15:20:50 +0000 (15:20 +0000)]
am
6312a721: am
a6e57b88: Merge "Always use the LocalePicker\'s preferred locale names." into lmp-dev
* commit '
6312a72136458287c467a224bb6e19ac9eedb203':
Jorim Jaggi [Tue, 16 Sep 2014 15:20:48 +0000 (15:20 +0000)]
am
723abba6: am
b2bea36b: Merge "Fix layout issues with landscape pattern/password layouts" into lmp-dev
* commit '
723abba6c5315390cfdada773987d9522b7b1038':
Edward Jee [Tue, 16 Sep 2014 08:31:58 +0000 (08:31 +0000)]
am
b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev
* commit '
b0954c1d1e02958fd357cae11613f4539fbe270a':
Do not show phonebook access permission dialog if pairing dialog has already been shown.
PauloftheWest [Tue, 16 Sep 2014 08:31:57 +0000 (08:31 +0000)]
am
0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev
* commit '
0ca0c8ad20e5c630c62bc83e53b8d552a35a3e90':
Removed all references to "Google Wi-Fi Assistant" from Settings.
Dianne Hackborn [Tue, 16 Sep 2014 08:31:56 +0000 (08:31 +0000)]
am
94aae9af: Little more on issue #
17495264: tweak when we ignore initial times.
* commit '
94aae9afd18c17848aed68addd19d93c937c7555':
Little more on issue #
17495264: tweak when we ignore initial times.
Dianne Hackborn [Tue, 16 Sep 2014 08:31:55 +0000 (08:31 +0000)]
am
ecffbc91: Merge "Fix issue #
17495264: Battery history graph is bad" into lmp-dev
* commit '
ecffbc91b15ec558be27fd171a64ad5db9e2b7d1':
Fix issue #
17495264: Battery history graph is bad
Maurice Lam [Tue, 16 Sep 2014 08:31:54 +0000 (08:31 +0000)]
am
795511ec: [WifiSetup] Disable app starting window
* commit '
795511ec9c952041afb158d43dd22960443b503f':
[WifiSetup] Disable app starting window
PauloftheWest [Tue, 16 Sep 2014 08:29:09 +0000 (08:29 +0000)]
am
7b03a452: am
dc985292: am
13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev
* commit '
7b03a45227a304b9407e565994c491dbee64e4cd':
Updated Wi-Fi Settings icons to new filled-in teal format.
Edward Jee [Tue, 16 Sep 2014 01:19:07 +0000 (01:19 +0000)]
Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev
PauloftheWest [Mon, 15 Sep 2014 23:56:07 +0000 (23:56 +0000)]
am
56b3f338: am
654517a5: Merge "Fixed a Null Pointer Error in Bluetooth Settings." into lmp-dev
* commit '
56b3f338e7bc85d30f56eafce4d6d0dc2dd46e3b':
Amith Yamasani [Mon, 15 Sep 2014 23:56:06 +0000 (23:56 +0000)]
am
b8931381: am
67079996: Merge "Handle disallowed NFC beam restriction" into lmp-dev
* commit '
b89313812dbefe68ac48b06e3ca9c603c42cae1c':
Adam Lesinski [Mon, 15 Sep 2014 23:56:05 +0000 (23:56 +0000)]
am
98739309: am
3649045d: Merge "Make UsageAccess WarningDialog actually instatiatable." into lmp-dev
* commit '
98739309e15e1437f15d92872712fe05ba29a4dc':
PauloftheWest [Mon, 15 Sep 2014 23:56:04 +0000 (23:56 +0000)]
am
4cf6dcf6: am
29a9c684: Merge "Removed connect button from Saved Networks dialog." into lmp-dev
* commit '
4cf6dcf6aff003cc4d294275209cb3987c07775f':
Zoltan Szatmary-Ban [Mon, 15 Sep 2014 23:56:03 +0000 (23:56 +0000)]
am
dbcfc1b7: am
574db426: Merge "Update Trusted Credentials screen in settings" into lmp-dev
* commit '
dbcfc1b73678e53bf89d11c5c4fe47a74f4508a7':
Elliott Hughes [Mon, 15 Sep 2014 23:56:00 +0000 (23:56 +0000)]
am
bce031b0: am
5c0d0729: Merge "Start cleaning up percentage formatting in Settings." into lmp-dev
* commit '
bce031b0ad16c0ba127627ca7231d872d23ce9c3':
PauloftheWest [Mon, 15 Sep 2014 23:55:59 +0000 (23:55 +0000)]
am
5dcec205: am
bec89d79: Merge "Fixed scrolling on the Wi-Fi Settings Dialog." into lmp-dev
* commit '
5dcec20557353a79aaa97e113583507b4f1a7433':
PauloftheWest [Mon, 15 Sep 2014 23:55:58 +0000 (23:55 +0000)]
am
91f76560: am
e5f84735: Merge "Disabled SIM Cards in Settings." into lmp-dev
* commit '
91f76560f80f006ce704f80f21400d91ffe43e89':
PauloftheWest [Mon, 15 Sep 2014 23:55:57 +0000 (23:55 +0000)]
am
9128659b: am
d0db988b: Merge "Material theme updates for Wifi Dialog." into lmp-dev
* commit '
9128659be872890927291c30df781d3522d34a1e':
Andres Morales [Mon, 15 Sep 2014 23:55:51 +0000 (23:55 +0000)]
am
a40a9a90: am
4fc50dae: Merge "Fix issue where can\'t FR Volantis if OEM unlock is enabled" into lmp-dev
* commit '
a40a9a90b33fc3c51f08b03503354ab0e90ac0c2':
PauloftheWest [Mon, 15 Sep 2014 23:55:50 +0000 (23:55 +0000)]
am
5c86c955: am
5fe30ea8: Merge "Turning Bluetooth on will make the device discoverable." into lmp-dev
* commit '
5c86c9551388e85b172a8305a0e9dd79ef025785':
Alan Viverette [Mon, 15 Sep 2014 23:55:49 +0000 (23:55 +0000)]
am
ce7c0337: am
01f3a15e: Merge "Use correct list index for search highlighting" into lmp-dev
* commit '
ce7c0337202bbf063a50e6436c246b35949ae0c3':
vandwalle [Mon, 15 Sep 2014 23:55:48 +0000 (23:55 +0000)]
am
4d5ddf0c: am
c187193c: Merge "prettify the wifi verbose logging string" into lmp-dev
* commit '
4d5ddf0cce5cd5cafb5b23e3289a279c7540abca':
Alexandra Gherghina [Mon, 15 Sep 2014 23:55:47 +0000 (23:55 +0000)]
am
c210a3f2: am
edbfedf5: Merge "Splits out ACTION_MAIN intent filter for Settings and doesn\'t forward it." into lmp-dev
* commit '
c210a3f2c645ead7dee4c76662dc0da14ffb0bc1':
Carlos Valdivia [Mon, 15 Sep 2014 23:55:46 +0000 (23:55 +0000)]
am
b38b1b9e: am
690ce1b3: Merge "SECURITY: Don\'t pass a usable Pending Intent to 3rd parties." into lmp-dev
* commit '
b38b1b9ed63ed11ad845551300b0e48720dec843':
Jim Miller [Mon, 15 Sep 2014 23:55:45 +0000 (23:55 +0000)]
am
75c782bf: am
1f389c19: Merge "Fix problem where rotating the device doesn\'t launch TrustAgent pref" into lmp-dev
* commit '
75c782bf71057138375e5e11d815cde5c301e4de':
Alexandra Gherghina [Mon, 15 Sep 2014 23:55:44 +0000 (23:55 +0000)]
am
ba89f50a: am
80cd3732: Merge "Reset Settings task when using the user switcher" into lmp-dev
* commit '
ba89f50ae7bf52ac7307723257cea8a3114b1a51':
Alexandra Gherghina [Mon, 15 Sep 2014 23:55:43 +0000 (23:55 +0000)]
am
70ad4ffd: am
dc3193ca: Merge "Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS" into lmp-dev
* commit '
70ad4ffd056c93338eb0e292fb6e675b40cb7434':
Amith Yamasani [Mon, 15 Sep 2014 23:55:42 +0000 (23:55 +0000)]
Fabrice Di Meglio [Mon, 15 Sep 2014 23:55:41 +0000 (23:55 +0000)]
am
17f556c7: am
b5cc0134: Merge "Fix bug #
15890188 wifi toggle on-off switch missing after skipping setup wizard" into lmp-dev
* commit '
17f556c7081e911268d5f9ed6bdc349b6ace6c65':
PauloftheWest [Mon, 15 Sep 2014 23:55:40 +0000 (23:55 +0000)]
am
5437b488: am
c7fafa25: Merge "Material design updates for Bluetooth Settings dialog." into lmp-dev
* commit '
5437b488cb39538c2685013c0afc5ef798d3847e':
Barnaby James [Mon, 15 Sep 2014 23:55:39 +0000 (23:55 +0000)]
am
1299446d: am
3c6f7a33: Merge "Remove intent filter for Airplane mode voice activity." into lmp-dev
* commit '
1299446dee8d928ade9d3b7f2e433dbcf153551e':
Amith Yamasani [Mon, 15 Sep 2014 23:55:38 +0000 (23:55 +0000)]
am
ba790ca3: am
91648629: Merge "Follow API change for method name" into lmp-dev
* commit '
ba790ca3aceb0be89e5b0142e6a871cf2b7e03a0':
Svetoslav [Mon, 15 Sep 2014 23:55:37 +0000 (23:55 +0000)]
am
9b8912db: am
fd3a3d79: Merge "Fix an occasional crash in print job state fragment in Settings." into lmp-dev
* commit '
9b8912dbee4b0acd6e7cfd8920e018695074a39e':
Svetoslav [Mon, 15 Sep 2014 23:55:36 +0000 (23:55 +0000)]
am
3c0385e4: am
527ecccc: Merge "Update Settings due to API changes." into lmp-dev
* commit '
3c0385e46506ecbd8694f10bc041c53695a9e8bb':
Jorim Jaggi [Mon, 15 Sep 2014 23:55:35 +0000 (23:55 +0000)]
am
60b7e882: am
f7cdbc3a: Merge "Remove weird divider from confirm_lock_pattern" into lmp-dev
* commit '
60b7e88289651ce846e179f663964602f469f4b6':
Alexandra Gherghina [Mon, 15 Sep 2014 23:55:34 +0000 (23:55 +0000)]
Alexandra Gherghina [Mon, 15 Sep 2014 23:55:32 +0000 (23:55 +0000)]
am
8378516b: am
9b6ab158: Merge "Update Settings cross-profile intent filters upon OTA" into lmp-dev
* commit '
8378516b0bb4deefb68f30693f5bac2a3e1508ab':
Dan Sandler [Mon, 15 Sep 2014 23:55:32 +0000 (23:55 +0000)]
am
6f0507ad: am
8aed3e3f: Only fetch titles of ringtones coming from the MediaStore.
* commit '
6f0507add78fe79212b8408651be74e59f7c9dfa':
Wink Saville [Mon, 15 Sep 2014 23:55:31 +0000 (23:55 +0000)]
am
0e559d53: am
aa188b53: Merge "More cleanup prior to unhiding" into lmp-dev
* commit '
0e559d532c7cce810caa06ec6b69638e608b5998':
Fabrice Di Meglio [Mon, 15 Sep 2014 23:55:30 +0000 (23:55 +0000)]
am
a1c6288b: am
0535ed55: Merge "Fix bug #
17393417 Developer Options are not indexed after activating them" into lmp-dev
* commit '
a1c6288b137e4babbf1da3bc3a573a106e7a939d':
PauloftheWest [Mon, 15 Sep 2014 23:55:29 +0000 (23:55 +0000)]
am
4cebc121: am
4a1b7b5f: Merge "Bug fix: Toggling Bluetooth off then on will now initiate a scan." into lmp-dev
* commit '
4cebc121506129eda1a6222bc19469956256643d':
Chris Wren [Mon, 15 Sep 2014 23:55:28 +0000 (23:55 +0000)]
am
2ed0ea21: am
0a59607e: Merge "Implement per-app sensitivity settings toggle." into lmp-dev
* commit '
2ed0ea2120d8356126f614655701382d1bf2a0fb':
Fabrice Di Meglio [Mon, 15 Sep 2014 23:55:27 +0000 (23:55 +0000)]
am
f475cfa3: am
ed1175cf: Merge "Increase the delay for the Search result Ripple effect to happen" into lmp-dev
* commit '
f475cfa354f478dd8ad5779ce9e04c551e4bc3ed':
Andres Morales [Mon, 15 Sep 2014 23:55:26 +0000 (23:55 +0000)]
am
db9745e4: am
5c9a3b0d: Merge "New black drawables for tap and pay" into lmp-dev
* commit '
db9745e43a416afb6a52ff89013c2353c812faee':
Andres Morales [Mon, 15 Sep 2014 23:55:25 +0000 (23:55 +0000)]
am
d5723235: am
1c09186d: Merge "Fix issue with wifi passwords >16 chars" into lmp-dev
* commit '
d572323580c0eabb59e9d63f4f3c58f1aa32c71b':
Baligh Uddin [Mon, 15 Sep 2014 23:55:24 +0000 (23:55 +0000)]
am
19843ad1: (-s ours) am
87c7cec8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
19843ad15e5b461ffb061c2c9478054f4cde70da':
Baligh Uddin [Mon, 15 Sep 2014 23:55:23 +0000 (23:55 +0000)]
am
184a7b4f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
184a7b4fd367a3d372efabc9aaf369b6ab8504d1':
Import translations. DO NOT MERGE
PauloftheWest [Mon, 15 Sep 2014 23:55:22 +0000 (23:55 +0000)]
am
357e2826: am
0e73c521: Merge "Material theme updates for Bluetooth Device picker." into lmp-dev
* commit '
357e2826e166821e489607e9ae4006fed19cf57a':
PauloftheWest [Mon, 15 Sep 2014 23:55:21 +0000 (23:55 +0000)]
am
0410a1e3: am
92de681e: Merge "Fix the truncating of Bluetooth icons." into lmp-dev
* commit '
0410a1e327f5276cc600ebda87ee0983f94b3891':
Fabrice Di Meglio [Mon, 15 Sep 2014 23:55:20 +0000 (23:55 +0000)]
am
e758df57: am
5a8a75d9: Merge "Fix bug #
17358371 Wallpaper attributions in "Legal Information" section of Settings" into lmp-dev
* commit '
e758df576a099920e00ec360267439b4a719c2ad':
Chris Wren [Mon, 15 Sep 2014 23:55:19 +0000 (23:55 +0000)]
am
dd95e098: am
ee846f88: missing dep. Revert "Implement per-app sensitivity settings toggle."
* commit '
dd95e098f4e2b8d361df19964ab1ca6701840882':
Chris Wren [Mon, 15 Sep 2014 23:55:19 +0000 (23:55 +0000)]
am
cec40645: am
77fdc93b: Merge "Implement per-app sensitivity settings toggle." into lmp-dev
* commit '
cec406455239e26056687813dbdefcd9ceafa783':
Dan Sandler [Mon, 15 Sep 2014 23:55:16 +0000 (23:55 +0000)]
am
84176e56: am
feec34ce: Merge "Don\'t block notifications from system packages." into lmp-dev
* commit '
84176e5691055d416bc6770704b00f2925a98318':
PauloftheWest [Mon, 15 Sep 2014 23:55:15 +0000 (23:55 +0000)]
am
75b8535f: am
e1a164bf: Merge "Aligned buttons on the Wi-Fi Assistant Card." into lmp-dev
* commit '
75b8535f7d7329e3b3bf2743987abae850795845':
Zoltan Szatmary-Ban [Mon, 15 Sep 2014 23:55:14 +0000 (23:55 +0000)]
am
34e537ed: am
c91d2cd0: Merge "Put VPN settings under primary profile control" into lmp-dev
* commit '
34e537ed277415530c4a811bfcd9a27a3f17bd00':