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

Sky Faber [Mon, 22 Sep 2014 23:43:04 +0000 (16:43 -0700)]

Separate wifi AP added by applications.

-Add permission to allow settings to modify all wifi APs
-Add option to show AP owners.

Change-Id: I12943563ef714c4287e13488578f020d136d006d

commit | commitdiff | tree

Baligh Uddin [Sun, 21 Sep 2014 18:38:25 +0000 (18:38 +0000)]

am 50a3d405: (-s ours) am 3e8cec75: (-s ours) am 9ca34e9a: (-s ours) Import translations. DO NOT MERGE

* commit '50a3d40558a33c1bfe34852346fb9582f8fb98d6':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 21 Sep 2014 18:34:17 +0000 (18:34 +0000)]

am c815ddc2: (-s ours) am 9d4f29d2: (-s ours) Import translations. DO NOT MERGE

* commit 'c815ddc21715e4a6328bd5ce2b89725653d7475a':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 21 Sep 2014 18:30:27 +0000 (18:30 +0000)]

am 3e8cec75: (-s ours) am 9ca34e9a: (-s ours) Import translations. DO NOT MERGE

* commit '3e8cec75288a91a566f4957e33122223877a7011':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 21 Sep 2014 18:19:46 +0000 (18:19 +0000)]

am 9ca34e9a: (-s ours) Import translations. DO NOT MERGE

* commit '9ca34e9ad63271958d453d5126ce6edf0e501483':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 21 Sep 2014 18:16:51 +0000 (18:16 +0000)]

am 9d4f29d2: (-s ours) Import translations. DO NOT MERGE

* commit '9d4f29d207fb147dbc16fd0fadc4ed5edc08abd3':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 21 Sep 2014 06:45:37 +0000 (23:45 -0700)]

Import translations. DO NOT MERGE

Change-Id: I1129b9bf0472d9d37a476c44fdf981b01e29f7b3
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Sun, 21 Sep 2014 06:31:22 +0000 (23:31 -0700)]

Import translations. DO NOT MERGE

Change-Id: I318c0e8a24903330e142059ab9d41b2dd13e39d1
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Sun, 21 Sep 2014 06:28:12 +0000 (23:28 -0700)]

Import translations. DO NOT MERGE

Change-Id: I03201beb1e3307a852bef4cdae23e6d313588e0b
Auto-generated-cl: translation import

commit | commitdiff | tree

PauloftheWest [Sat, 20 Sep 2014 00:38:27 +0000 (00:38 +0000)]

am c8648718: am 934af544: am 04301e3d: am 3845f270: am 27dcfbbd: Merge "Fixed a Bluetooth discovery bug." into lmp-dev

* commit 'c8648718db9c05482579a46e48907851849b1670':
Fixed a Bluetooth discovery bug.

commit | commitdiff | tree

PauloftheWest [Sat, 20 Sep 2014 00:38:26 +0000 (00:38 +0000)]

am a0f49568: am f5f3596c: am e9a8b3df: am 1f604d5b: am 1977342e: Merge "Fixed Settings Cellular Networks crash." into lmp-dev

* commit 'a0f49568b63f7daba34268d495bbf5f7696df545':
Fixed Settings Cellular Networks crash.

commit | commitdiff | tree

PauloftheWest [Sat, 20 Sep 2014 00:27:33 +0000 (00:27 +0000)]

am 934af544: am 04301e3d: am 3845f270: am 27dcfbbd: Merge "Fixed a Bluetooth discovery bug." into lmp-dev

* commit '934af5444c6957ab476098bf3fb95789942ed51f':
Fixed a Bluetooth discovery bug.

commit | commitdiff | tree

PauloftheWest [Sat, 20 Sep 2014 00:27:32 +0000 (00:27 +0000)]

am f5f3596c: am e9a8b3df: am 1f604d5b: am 1977342e: Merge "Fixed Settings Cellular Networks crash." into lmp-dev

* commit 'f5f3596c89149013dcc565dbf6d19514faf240b3':
Fixed Settings Cellular Networks crash.

commit | commitdiff | tree

PauloftheWest [Sat, 20 Sep 2014 00:13:33 +0000 (00:13 +0000)]

am 04301e3d: am 3845f270: am 27dcfbbd: Merge "Fixed a Bluetooth discovery bug." into lmp-dev

* commit '04301e3d9b1b8dc0b21b97d01856474fa10990d5':
Fixed a Bluetooth discovery bug.

commit | commitdiff | tree

PauloftheWest [Sat, 20 Sep 2014 00:13:32 +0000 (00:13 +0000)]

am e9a8b3df: am 1f604d5b: am 1977342e: Merge "Fixed Settings Cellular Networks crash." into lmp-dev

* commit 'e9a8b3df7d9050517b29aa7bb57f92adc833ea7b':
Fixed Settings Cellular Networks crash.

commit | commitdiff | tree

PauloftheWest [Sat, 20 Sep 2014 00:00:54 +0000 (00:00 +0000)]

am 3845f270: am 27dcfbbd: Merge "Fixed a Bluetooth discovery bug." into lmp-dev

* commit '3845f270ff1c51611cc14b524878ae6c83e41590':
Fixed a Bluetooth discovery bug.

commit | commitdiff | tree

PauloftheWest [Sat, 20 Sep 2014 00:00:53 +0000 (00:00 +0000)]

am 1f604d5b: am 1977342e: Merge "Fixed Settings Cellular Networks crash." into lmp-dev

* commit '1f604d5b83475011bc9ee3dba24d7bad900466d9':
Fixed Settings Cellular Networks crash.

commit | commitdiff | tree

PauloftheWest [Fri, 19 Sep 2014 23:53:09 +0000 (23:53 +0000)]

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

* commit '27dcfbbd893cb5a65fa27ac6b968559e22bf59e4':
Fixed a Bluetooth discovery bug.

commit | commitdiff | tree

PauloftheWest [Fri, 19 Sep 2014 23:53:08 +0000 (23:53 +0000)]

am 1977342e: Merge "Fixed Settings Cellular Networks crash." into lmp-dev

* commit '1977342e43a921005e40d213bef3fe66b0bbefbc':
Fixed Settings Cellular Networks crash.

commit | commitdiff | tree

PauloftheWest [Fri, 19 Sep 2014 23:45:24 +0000 (23:45 +0000)]

Merge "Fixed a Bluetooth discovery bug." into lmp-dev

commit | commitdiff | tree

PauloftheWest [Fri, 19 Sep 2014 23:44:01 +0000 (23:44 +0000)]

Merge "Fixed Settings Cellular Networks crash." into lmp-dev

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Sep 2014 23:40:56 +0000 (23:40 +0000)]

am e8362a99: (-s ours) am 7c4b3c13: (-s ours) am 026cbba1: (-s ours) am 4e3f5709: (-s ours) am f015d47c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'e8362a99cf0699ebe502f9d0522bad2c05ec901b':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Sep 2014 23:31:05 +0000 (23:31 +0000)]

am e9f87a45: (-s ours) am a1960823: (-s ours) am 30032b95: (-s ours) am ae7c180a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit 'e9f87a458b5a9e61501f60c5728f5c7a93a327cd':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Svetoslav [Fri, 19 Sep 2014 23:30:04 +0000 (23:30 +0000)]

am 90d5dc63: am 4b1a41c4: am d56668a7: am abcf0302: am 1154caa8: Merge "Crash in Settings cancelling a print job from the job list." into lmp-dev

* commit '90d5dc63105b3fe46682bb183f7bf99e36aa8e9b':
Crash in Settings cancelling a print job from the job list.

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Sep 2014 23:17:54 +0000 (23:17 +0000)]

am 7c4b3c13: (-s ours) am 026cbba1: (-s ours) am 4e3f5709: (-s ours) am f015d47c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '7c4b3c13330199f0494568b53e58a1f5669d54b4':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Sep 2014 23:09:08 +0000 (23:09 +0000)]

am 026cbba1: (-s ours) am 4e3f5709: (-s ours) am f015d47c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '026cbba1f25bae341bd832edbebaa2c60e12c836':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Sep 2014 22:59:53 +0000 (22:59 +0000)]

am a1960823: (-s ours) am 30032b95: (-s ours) am ae7c180a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit 'a19608235dfb38e7d7bf53326a954d4f6a35aab2':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Sep 2014 22:56:52 +0000 (22:56 +0000)]

am 4e3f5709: (-s ours) am f015d47c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '4e3f5709ad0892d3c8ffe6cbb620000ffe21f640':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Sep 2014 22:49:37 +0000 (22:49 +0000)]

am 30032b95: (-s ours) am ae7c180a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '30032b95d815312c1fdfc4c75b616c18385cd990':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Sep 2014 22:46:30 +0000 (22:46 +0000)]

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

* commit 'f015d47cf526b2bc6061f8d10dd28b82df1da4ab':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Sep 2014 22:44:01 +0000 (22:44 +0000)]

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

* commit 'ae7c180ad763d7b477c0e5ca5ec9d2c908f440cd':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Sep 2014 22:34:17 +0000 (22:34 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-dev

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Sep 2014 22:34:16 +0000 (22:34 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Sep 2014 22:34:13 +0000 (22:34 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Svetoslav [Fri, 19 Sep 2014 22:20:10 +0000 (22:20 +0000)]

am 4b1a41c4: am d56668a7: am abcf0302: am 1154caa8: Merge "Crash in Settings cancelling a print job from the job list." into lmp-dev

* commit '4b1a41c4c657b704e65f7d515b91118feb109693':
Crash in Settings cancelling a print job from the job list.

commit | commitdiff | tree

Svetoslav [Fri, 19 Sep 2014 22:11:02 +0000 (22:11 +0000)]

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

* commit 'd56668a7d13227780005fcffdcdbd75810cf926f':
Crash in Settings cancelling a print job from the job list.

commit | commitdiff | tree

Svetoslav [Fri, 19 Sep 2014 22:00:59 +0000 (22:00 +0000)]

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

* commit 'abcf0302e4351089322debf3739ac169ec299a5a':
Crash in Settings cancelling a print job from the job list.

commit | commitdiff | tree

Svetoslav [Fri, 19 Sep 2014 21:49:18 +0000 (21:49 +0000)]

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

* commit '1154caa834d1fb502e9f80a509683faaf9b16a7f':
Crash in Settings cancelling a print job from the job list.

commit | commitdiff | tree

Svetoslav [Fri, 19 Sep 2014 21:41:56 +0000 (21:41 +0000)]

Merge "Crash in Settings cancelling a print job from the job list." into lmp-dev

commit | commitdiff | tree

Svetoslav [Fri, 19 Sep 2014 21:15:48 +0000 (14:15 -0700)]

Crash in Settings cancelling a print job from the job list.

bug:17585582

Change-Id: I44aef7e09c26141388b410762e93164d8df9a0c6

commit | commitdiff | tree

PauloftheWest [Fri, 19 Sep 2014 19:39:28 +0000 (12:39 -0700)]

Fixed a Bluetooth discovery bug.

+ Now when a user goes to Settings->Bluetooth and turns on Bluetooth,
the device will be discoverable.

Bug: 17368189
Change-Id: Ia0d8000ddf7e3c3b43172c08ee28e7305d205462

commit | commitdiff | tree

Vinit Deshpande [Fri, 19 Sep 2014 19:08:59 +0000 (19:08 +0000)]

am 579e970a: am cce30794: am 50234a19: am 22592afd: am 9a8c58d4: Merge "Fix automatic Wi-fi toggle" into lmp-dev

* commit '579e970a907fe0d99cdfe1f7cf9bd70343944df6':
Fix automatic Wi-fi toggle

commit | commitdiff | tree

Vinit Deshpande [Fri, 19 Sep 2014 18:58:46 +0000 (18:58 +0000)]

am cce30794: am 50234a19: am 22592afd: am 9a8c58d4: Merge "Fix automatic Wi-fi toggle" into lmp-dev

* commit 'cce30794f06310c56024d80e45dcb5d8e7d4a4fa':
Fix automatic Wi-fi toggle

commit | commitdiff | tree

Vinit Deshpande [Fri, 19 Sep 2014 18:49:14 +0000 (18:49 +0000)]

am 50234a19: am 22592afd: am 9a8c58d4: Merge "Fix automatic Wi-fi toggle" into lmp-dev

* commit '50234a19aa8d2a5b4b640bbe3cf4f6d735a8baee':
Fix automatic Wi-fi toggle

commit | commitdiff | tree

Vinit Deshpande [Fri, 19 Sep 2014 18:37:05 +0000 (18:37 +0000)]

am 22592afd: am 9a8c58d4: Merge "Fix automatic Wi-fi toggle" into lmp-dev

* commit '22592afdd5d35618ddd5f8662994d8c15cf43d3f':
Fix automatic Wi-fi toggle

commit | commitdiff | tree

Vinit Deshpande [Fri, 19 Sep 2014 18:29:45 +0000 (18:29 +0000)]

am 9a8c58d4: Merge "Fix automatic Wi-fi toggle" into lmp-dev

* commit '9a8c58d49dd84a45f216349fd4cbc2dacfdac9fe':
Fix automatic Wi-fi toggle

commit | commitdiff | tree

Vinit Deshpande [Fri, 19 Sep 2014 18:21:57 +0000 (18:21 +0000)]

Merge "Fix automatic Wi-fi toggle" into lmp-dev

commit | commitdiff | tree

PauloftheWest [Thu, 18 Sep 2014 17:12:25 +0000 (10:12 -0700)]

Fixed Settings Cellular Networks crash.

+ Removed the Cellular Networks option from Data Usage when the user is not
the phone owner.

Bug: 17529931
Change-Id: Ice89b8fb1e6d41fe71235af0beaa1ee3653f8cf8

commit | commitdiff | tree

Zoltan Szatmary-Ban [Fri, 19 Sep 2014 13:40:42 +0000 (13:40 +0000)]

am 073c9eb9: am dd320ec8: am 30b4aa9f: am 28277ee9: am 6e1d8277: Merge "Show Power usage details for the correct user" into lmp-dev

* commit '073c9eb9aba8ea39b853fcf116a28e4501075875':
Show Power usage details for the correct user

commit | commitdiff | tree

Zoltan Szatmary-Ban [Fri, 19 Sep 2014 13:26:57 +0000 (13:26 +0000)]

am dd320ec8: am 30b4aa9f: am 28277ee9: am 6e1d8277: Merge "Show Power usage details for the correct user" into lmp-dev

* commit 'dd320ec86920d87a6bc38036ca3e9824272ffd2e':
Show Power usage details for the correct user

commit | commitdiff | tree

Zoltan Szatmary-Ban [Fri, 19 Sep 2014 11:00:19 +0000 (11:00 +0000)]

am 30b4aa9f: am 28277ee9: am 6e1d8277: Merge "Show Power usage details for the correct user" into lmp-dev

* commit '30b4aa9f27e36a729f37e0c3bb3e7ebf45f851d1':
Show Power usage details for the correct user

commit | commitdiff | tree

Zoltan Szatmary-Ban [Fri, 19 Sep 2014 10:49:08 +0000 (10:49 +0000)]

am 28277ee9: am 6e1d8277: Merge "Show Power usage details for the correct user" into lmp-dev

* commit '28277ee9fa51cd039e83fd6a87fe60fefb07158a':
Show Power usage details for the correct user

commit | commitdiff | tree

Zoltan Szatmary-Ban [Fri, 19 Sep 2014 10:38:17 +0000 (10:38 +0000)]

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

* commit '6e1d8277e6c6443ad286bf25a7decb4f5a9b0cdf':
Show Power usage details for the correct user

commit | commitdiff | tree

Zoltan Szatmary-Ban [Fri, 19 Sep 2014 10:27:46 +0000 (10:27 +0000)]

Merge "Show Power usage details for the correct user" into lmp-dev

commit | commitdiff | tree

Matthew Xie [Fri, 19 Sep 2014 09:42:52 +0000 (09:42 +0000)]

am c0e25a1a: am 1d3a3fb5: am 3d76c268: am a93c4cae: am 72c34e6a: Merge "Do not overwrite alias with device name" into lmp-dev

* commit 'c0e25a1ad247d9f71163d15844f3bfa3d2c81418':
Do not overwrite alias with device name

commit | commitdiff | tree

Matthew Xie [Fri, 19 Sep 2014 09:28:57 +0000 (09:28 +0000)]

am 1d3a3fb5: am 3d76c268: am a93c4cae: am 72c34e6a: Merge "Do not overwrite alias with device name" into lmp-dev

* commit '1d3a3fb52c76e2203e85bb2a5152846f209fae34':
Do not overwrite alias with device name

commit | commitdiff | tree

Matthew Xie [Fri, 19 Sep 2014 08:40:18 +0000 (08:40 +0000)]

am 3d76c268: am a93c4cae: am 72c34e6a: Merge "Do not overwrite alias with device name" into lmp-dev

* commit '3d76c26887bb0e8f74e76bf64801b6c291ce8847':
Do not overwrite alias with device name

commit | commitdiff | tree

PauloftheWest [Fri, 19 Sep 2014 08:13:57 +0000 (08:13 +0000)]

am 7612e0d7: am 21afc838: am 50a53bdb: am f6526146: am 0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev

* commit '7612e0d7093c99bf3e3a4bdaa90302acbe66e906':

commit | commitdiff | tree

Sander Alewijnse [Fri, 19 Sep 2014 08:13:13 +0000 (08:13 +0000)]

am 18d99cea: am fc10b1e8: am 09c1ddc5: am b997bd50: am 4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev

* commit '18d99ceab6df1d183b686c914ffcb30e550e2a70':

commit | commitdiff | tree

Mark Salyzyn [Fri, 19 Sep 2014 08:10:16 +0000 (08:10 +0000)]

am 218d4962: am b340d01e: am 9d690250: am 66718d5a: am 894af268: logd: settings: ro.config.low_ram support

* commit '218d49625bc2c9849f76f990c8e14873a84a8161':

commit | commitdiff | tree

Amith Yamasani [Fri, 19 Sep 2014 07:44:43 +0000 (07:44 +0000)]

am e1d66664: am befe3c6f: am c7ab2db7: am 80a1ced5: am 69b67465: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev

* commit 'e1d66664520d5f0e48f6df128421cccb4d527004':

commit | commitdiff | tree

John Spurlock [Fri, 19 Sep 2014 07:44:37 +0000 (07:44 +0000)]

am f1f11b5b: am 7cd016e3: am 7dfc3540: am 0f01eb7f: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev

* commit 'f1f11b5b25ceed85f74c6d64e91a870bf7a1592c':

commit | commitdiff | tree

PauloftheWest [Fri, 19 Sep 2014 07:43:56 +0000 (07:43 +0000)]

am f03f6ab3: am ed9fd0dd: am 01de9832: am b2737bc0: am 3cc81aea: Increase char limit for translation.

* commit 'f03f6ab3762611ee22b1dbb3dc6bb81379d8ac7e':

commit | commitdiff | tree

Maurice Lam [Fri, 19 Sep 2014 07:35:49 +0000 (07:35 +0000)]

am 5130a2e4: am 670e1e5e: am ac115451: am 7fc505a1: am 27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev

* commit '5130a2e4539e3fea3f13475cf92e94cd158fd0d5':

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Sep 2014 07:35:48 +0000 (07:35 +0000)]

am 0bb9427b: (-s ours) am c6954436: (-s ours) am bbaad6b9: (-s ours) am 453053db: (-s ours) am 09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '0bb9427b4a2fcb4af48067cb5e1161503fa28b16':

commit | commitdiff | tree

PauloftheWest [Fri, 19 Sep 2014 07:35:47 +0000 (07:35 +0000)]

am 3244c683: am 2aed3a5e: am ebb04444: am 9e7073ae: am ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev

* commit '3244c683a2d0c4e50919ea2e8cd2857729897b5c':

commit | commitdiff | tree

Edward Jee [Fri, 19 Sep 2014 07:35:46 +0000 (07:35 +0000)]

am 96d840fc: am 78189c64: am a17545fa: am c64a51cb: am ac8b5b7f: Migrates PBAP and MAP access permission data from Settings to Bluetooth.

* commit '96d840fc12d894ed6b2a96522e833e6ec7056dd6':

commit | commitdiff | tree

Edward Jee [Fri, 19 Sep 2014 07:35:45 +0000 (07:35 +0000)]

am 3c4f081f: 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 '3c4f081f590a5ff84a2820b013a5ee300dbfdc73':

commit | commitdiff | tree

PauloftheWest [Fri, 19 Sep 2014 07:35:44 +0000 (07:35 +0000)]

am b268fad4: am 3724edb3: am f4713e0f: am 99f7d73b: am 0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev

* commit 'b268fad47e6a1bd625ccb3b1f76577beee258895':

commit | commitdiff | tree

Dianne Hackborn [Fri, 19 Sep 2014 07:35:43 +0000 (07:35 +0000)]

am cc9cacb5: am 4e2f9ca6: am 99b1261c: am 9e4b5269: am 94aae9af: Little more on issue #17495264: tweak when we ignore initial times.

* commit 'cc9cacb5d480f532bfe003f9d8011cfbe2873267':

commit | commitdiff | tree

Dianne Hackborn [Fri, 19 Sep 2014 07:35:42 +0000 (07:35 +0000)]

am be46e2a4: am 5df5798e: am 6d9988e7: am ebcba9dc: am ecffbc91: Merge "Fix issue #17495264: Battery history graph is bad" into lmp-dev

* commit 'be46e2a4bd339e37bd4d6d31408d459ec87872b5':

commit | commitdiff | tree

Maurice Lam [Fri, 19 Sep 2014 07:35:40 +0000 (07:35 +0000)]

am b3f7de50: am 9bfbf642: am 24956de0: am 95b283aa: am 795511ec: [WifiSetup] Disable app starting window

* commit 'b3f7de50ab806abb388b801e786208526a2f8730':

commit | commitdiff | tree

PauloftheWest [Fri, 19 Sep 2014 07:18:17 +0000 (07:18 +0000)]

am effc8f52: am 9de624d8: am 7b03a452: am dc985292: am 13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev

* commit 'effc8f52afba006682ddde5097b834a6245787b1':

commit | commitdiff | tree

Prem Kumar [Fri, 19 Sep 2014 06:52:17 +0000 (06:52 +0000)]

am 24bfab6f: am 02f66ba7: am 07e5ea99: am 319e7a27: am c0deb7da: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev

* commit '24bfab6f23ef33ac3a8c31c0668642057f7cdc2b':

commit | commitdiff | tree

John Spurlock [Fri, 19 Sep 2014 06:52:16 +0000 (06:52 +0000)]

am 6770d063: am c9f6945f: am be0827dd: am f97ec546: am 2e205e9b: Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev

* commit '6770d06345d75d391b4708f0813c810b9749573b':

commit | commitdiff | tree

Tyler Gunn [Fri, 19 Sep 2014 06:52:15 +0000 (06:52 +0000)]

am 0c079321: am 2b3505ed: am 8bad5a2d: am 86e452f9: am 3e71b197: Renaming Telecomm to Telecom.

* commit '0c07932111b94cfcc0bceabce7fd3d77883717bc':

commit | commitdiff | tree

Paul Lawrence [Fri, 19 Sep 2014 06:20:04 +0000 (06:20 +0000)]

am 158a291f: am 36d8bd3b: am db51c76a: am 7f4c4fb5: am c64c9808: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev

* commit '158a291f63c90d2979b1e7bffe40d0d29a38d366':

commit | commitdiff | tree

Kenny Guy [Fri, 19 Sep 2014 06:20:03 +0000 (06:20 +0000)]

am 9d266fb8: am daa4a466: am 28d2fa62: am 1ede808c: am db9e3f68: Merge "Fix crash when showing accounts." into lmp-dev

* commit '9d266fb852343abd5d1ae2152eabb74c7421b545':

commit | commitdiff | tree

Alexandra Gherghina [Fri, 19 Sep 2014 06:20:02 +0000 (06:20 +0000)]

am 60422087: am 7a09535c: am cd321d81: am 69af2c6a: am f738895d: Merge "Switch to using system-wide default user icons" into lmp-dev

* commit '60422087202bee68b6ffea07c8f1a4edc917cd33':

commit | commitdiff | tree

PauloftheWest [Fri, 19 Sep 2014 06:19:26 +0000 (06:19 +0000)]

am 8d8c5669: am e438c383: am 6c1d69ba: am 9f96ac6f: am 37b1253a: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev

* commit '8d8c566934636bd946eec8b4182f0ed7d2a577ed':

commit | commitdiff | tree

Dianne Hackborn [Fri, 19 Sep 2014 06:19:25 +0000 (06:19 +0000)]

am 1d463fb1: am f7acc1b3: am c857cddf: am 364ca371: am a5780340: Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev

* commit '1d463fb1e1488c1e37789537d4c3437d480cc864':

commit | commitdiff | tree

Svetoslav [Fri, 19 Sep 2014 06:19:23 +0000 (06:19 +0000)]

am c73b179d: am 0a91a8d2: am c33aef20: am c50841ca: am 85dcef12: Fix settings crash in print job screen.

* commit 'c73b179d59299a89846a9a7157dfdb2a13c1392d':

commit | commitdiff | tree

Vinit Deshpande [Fri, 19 Sep 2014 06:19:22 +0000 (06:19 +0000)]

am 7ae64011: am 84912814: am 7aaccec0: am c471629c: am 0a11f605: Merge "Don\'t require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev

* commit '7ae64011ad9d0615f55e52cc6d13ed622bab173e':

commit | commitdiff | tree

Svetoslav [Fri, 19 Sep 2014 06:19:21 +0000 (06:19 +0000)]

am 3ade85ec: am 9af0fce6: am 536cb798: am 842e9d04: am 72cfbcb4: Merge "Fix print icons in settings." into lmp-dev

* commit '3ade85ec739837ec33c161968480ff5e7c4f8184':

commit | commitdiff | tree

Carlos Valdivia [Fri, 19 Sep 2014 06:19:19 +0000 (06:19 +0000)]

am afc32763: 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 'afc3276323cf572dabb0024a741b6c46a9d6cf37':

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Sep 2014 06:19:18 +0000 (06:19 +0000)]

am 68498280: (-s ours) 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 '6849828060b7e34b56715e8657ddacf8f812d9de':

commit | commitdiff | tree

Dan Sandler [Fri, 19 Sep 2014 06:19:17 +0000 (06:19 +0000)]

am d446e475: am fecd8989: am 99e467a7: am e98bee54: am 1fb51987: Merge "Show a better list of apps." into lmp-dev

* commit 'd446e4750aeaec25aa8deb98b0e0e3ef38f7765e':

commit | commitdiff | tree

Zoltan Szatmary-Ban [Fri, 19 Sep 2014 06:19:16 +0000 (06:19 +0000)]

am f51abf9a: am bc8f3d08: am 118cf516: am 55cd479d: am cf911d10: Merge "Check for DeviceAdminInfo type before casting" into lmp-dev

* commit 'f51abf9a6449cf83fa795c2b4ac10c165840853a':

commit | commitdiff | tree

Zoltan Szatmary-Ban [Fri, 19 Sep 2014 06:19:15 +0000 (06:19 +0000)]

am 5b792c6b: am 23496243: am b2259b3a: am b46eeeb7: am f572fdd1: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev

* commit '5b792c6b817f10151c380ae63ce7f3852096f159':

commit | commitdiff | tree

Fabrice Di Meglio [Fri, 19 Sep 2014 06:19:13 +0000 (06:19 +0000)]

am 5b871c76: 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 '5b871c7630f9a0536cb1208f38ca0d8e9b724f58':

commit | commitdiff | tree

PauloftheWest [Fri, 19 Sep 2014 06:19:12 +0000 (06:19 +0000)]

am a90713df: am 08455c57: am c1806600: am 23d0ac44: am b2197d90: Added bluetooth_device_settings_header to fix build breakage.

* commit 'a90713df317928c6ccae9b5e32853a277e5ccc01':

commit | commitdiff | tree

Jim Miller [Fri, 19 Sep 2014 06:19:11 +0000 (06:19 +0000)]

am c31f5615: am 0787af48: am 825eb63c: am f496ae94: am ca03758e: Merge "Keep unlock attempt count after configuration change" into lmp-dev

* commit 'c31f5615815d7a7dce7e6045f8db7d1cb1adefd4':

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Sep 2014 06:19:10 +0000 (06:19 +0000)]

am abc05267: (-s ours) am c742cfc7: (-s ours) am 6f96fcc5: (-s ours) am 321b25a1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit 'abc05267d2a7abc49092d06195e507aa3d6207b5':
Import translations. DO NOT MERGE

commit | commitdiff | tree

PauloftheWest [Fri, 19 Sep 2014 06:19:08 +0000 (06:19 +0000)]

am 4e7ebb33: am 52e19465: am 1675c786: Merge "Made Bluetooth device dialog fully scrollable." into lmp-dev

* commit '4e7ebb332654a24254e9f7d59c05e4de33ccfa3d':

commit | commitdiff | tree

John Spurlock [Fri, 19 Sep 2014 06:19:07 +0000 (06:19 +0000)]

am f4ca7697: am 315e0a4a: am 31915522: Settings: Remove fixed dropdown width from "From" pref.

* commit 'f4ca7697d826ebb1ce640dfebace66706db6ac29':

commit | commitdiff | tree

PauloftheWest [Fri, 19 Sep 2014 06:19:05 +0000 (06:19 +0000)]

am ab9fe9d3: am 4708092e: am 8b7d27cb: Merge "Updated Bluetooth keyboard icon to teal." into lmp-dev

* commit 'ab9fe9d3e63f749014fa68f1c9a93998032fe46c':

commit | commitdiff | tree

Jason Monk [Fri, 19 Sep 2014 06:19:04 +0000 (06:19 +0000)]

am aef243e6: am c80014fb: am 062f736c: Adding zen mode condition dialog

* commit 'aef243e64efe54428f897c9ea46aaf5d36a9d58b':

commit | commitdiff | tree

Fabrice Di Meglio [Fri, 19 Sep 2014 06:19:03 +0000 (06:19 +0000)]

am 315ae793: am 743400b4: am 877fb7fb: Merge "Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility" into lmp-dev

* commit '315ae7930d6dc7f07c32e3025e61cfd34eca2887':

commit | commitdiff | tree

John Spurlock [Fri, 19 Sep 2014 06:19:02 +0000 (06:19 +0000)]

am 0c91e31d: am 417b8261: am 1e7dbd45: Settings: Use the same day sequence for downtime.

* commit '0c91e31da8e2ba0431939dcd023e7444e41abbf8':

commit | commitdiff | tree

John Spurlock [Fri, 19 Sep 2014 06:19:01 +0000 (06:19 +0000)]

am 0ea17d3b: am 0ed4f5b7: am cddb2954: Settings: Make downtime days scrollable.

* commit '0ea17d3b0510b78a2d06446ec136afde2c25ba4b':