Vinit Deshpande
|
30bb30dad0
|
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
|
2014-09-19 19:08:59 +00:00 |
|
Vinit Deshpande
|
579e970a90
|
am cce30794 : am 50234a19 : am 22592afd : am 9a8c58d4 : Merge "Fix automatic Wi-fi toggle" into lmp-dev
* commit 'cce30794f06310c56024d80e45dcb5d8e7d4a4fa':
Fix automatic Wi-fi toggle
|
2014-09-19 18:58:46 +00:00 |
|
Vinit Deshpande
|
cce30794f0
|
am 50234a19 : am 22592afd : am 9a8c58d4 : Merge "Fix automatic Wi-fi toggle" into lmp-dev
* commit '50234a19aa8d2a5b4b640bbe3cf4f6d735a8baee':
Fix automatic Wi-fi toggle
|
2014-09-19 18:49:14 +00:00 |
|
Vinit Deshpande
|
50234a19aa
|
am 22592afd : am 9a8c58d4 : Merge "Fix automatic Wi-fi toggle" into lmp-dev
* commit '22592afdd5d35618ddd5f8662994d8c15cf43d3f':
Fix automatic Wi-fi toggle
|
2014-09-19 18:37:05 +00:00 |
|
Vinit Deshpande
|
22592afdd5
|
am 9a8c58d4 : Merge "Fix automatic Wi-fi toggle" into lmp-dev
* commit '9a8c58d49dd84a45f216349fd4cbc2dacfdac9fe':
Fix automatic Wi-fi toggle
|
2014-09-19 18:29:45 +00:00 |
|
Vinit Deshpande
|
9a8c58d49d
|
Merge "Fix automatic Wi-fi toggle" into lmp-dev
|
2014-09-19 18:21:57 +00:00 |
|
Zoltan Szatmary-Ban
|
90ecb62348
|
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
|
2014-09-19 13:40:42 +00:00 |
|
Zoltan Szatmary-Ban
|
073c9eb9ab
|
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
|
2014-09-19 13:26:57 +00:00 |
|
Zoltan Szatmary-Ban
|
dd320ec869
|
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
|
2014-09-19 11:00:19 +00:00 |
|
Zoltan Szatmary-Ban
|
30b4aa9f27
|
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
|
2014-09-19 10:49:08 +00:00 |
|
Zoltan Szatmary-Ban
|
28277ee9fa
|
am 6e1d8277 : Merge "Show Power usage details for the correct user" into lmp-dev
* commit '6e1d8277e6c6443ad286bf25a7decb4f5a9b0cdf':
Show Power usage details for the correct user
|
2014-09-19 10:38:17 +00:00 |
|
Zoltan Szatmary-Ban
|
6e1d8277e6
|
Merge "Show Power usage details for the correct user" into lmp-dev
|
2014-09-19 10:27:47 +00:00 |
|
Matthew Xie
|
d263271c5c
|
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
|
2014-09-19 09:42:52 +00:00 |
|
Matthew Xie
|
c0e25a1ad2
|
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
|
2014-09-19 09:28:57 +00:00 |
|
Matthew Xie
|
1d3a3fb52c
|
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
|
2014-09-19 08:40:18 +00:00 |
|
PauloftheWest
|
c7c26a04e0
|
am 7612e0d7 : am 21afc838 : am 50a53bdb : am f6526146 : am 0f01eeff : Merge "Removed an extraneous messge when pairing." into lmp-dev
* commit '7612e0d7093c99bf3e3a4bdaa90302acbe66e906':
|
2014-09-19 08:13:57 +00:00 |
|
Sander Alewijnse
|
8f2fe44c4d
|
am 18d99cea : am fc10b1e8 : am 09c1ddc5 : am b997bd50 : am 4241b0a9 : Merge "Update targetSdkVersion check." into lmp-dev
* commit '18d99ceab6df1d183b686c914ffcb30e550e2a70':
|
2014-09-19 08:13:13 +00:00 |
|
Mark Salyzyn
|
611df59f19
|
am 218d4962 : am b340d01e : am 9d690250 : am 66718d5a : am 894af268 : logd: settings: ro.config.low_ram support
* commit '218d49625bc2c9849f76f990c8e14873a84a8161':
|
2014-09-19 08:10:16 +00:00 |
|
Amith Yamasani
|
bc2ad5e28d
|
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':
|
2014-09-19 07:44:43 +00:00 |
|
John Spurlock
|
caea99bc5f
|
am f1f11b5b : am 7cd016e3 : am 7dfc3540 : am 0f01eb7f : am ae9d437b : Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
* commit 'f1f11b5b25ceed85f74c6d64e91a870bf7a1592c':
|
2014-09-19 07:44:37 +00:00 |
|
PauloftheWest
|
301381b4f7
|
am f03f6ab3 : am ed9fd0dd : am 01de9832 : am b2737bc0 : am 3cc81aea : Increase char limit for translation.
* commit 'f03f6ab3762611ee22b1dbb3dc6bb81379d8ac7e':
|
2014-09-19 07:43:56 +00:00 |
|
Maurice Lam
|
15268118df
|
am 5130a2e4 : am 670e1e5e : am ac115451 : am 7fc505a1 : am 27d74fa2 : Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
* commit '5130a2e4539e3fea3f13475cf92e94cd158fd0d5':
|
2014-09-19 07:35:49 +00:00 |
|
Baligh Uddin
|
5653e2543d
|
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':
|
2014-09-19 07:35:48 +00:00 |
|
PauloftheWest
|
c0865057de
|
am 3244c683 : am 2aed3a5e : am ebb04444 : am 9e7073ae : am ec21e62a : Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev
* commit '3244c683a2d0c4e50919ea2e8cd2857729897b5c':
|
2014-09-19 07:35:47 +00:00 |
|
Edward Jee
|
437a1ad0fb
|
am 96d840fc : am 78189c64 : am a17545fa : am c64a51cb : am ac8b5b7f : Migrates PBAP and MAP access permission data from Settings to Bluetooth.
* commit '96d840fc12d894ed6b2a96522e833e6ec7056dd6':
|
2014-09-19 07:35:46 +00:00 |
|
Edward Jee
|
b6b99d8377
|
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':
|
2014-09-19 07:35:45 +00:00 |
|
PauloftheWest
|
803a742f50
|
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':
|
2014-09-19 07:35:44 +00:00 |
|
Dianne Hackborn
|
59637933b6
|
am cc9cacb5 : am 4e2f9ca6 : am 99b1261c : am 9e4b5269 : am 94aae9af : Little more on issue #17495264: tweak when we ignore initial times.
* commit 'cc9cacb5d480f532bfe003f9d8011cfbe2873267':
|
2014-09-19 07:35:43 +00:00 |
|
Dianne Hackborn
|
5e91d3d67c
|
am be46e2a4 : am 5df5798e : am 6d9988e7 : am ebcba9dc : am ecffbc91 : Merge "Fix issue #17495264: Battery history graph is bad" into lmp-dev
* commit 'be46e2a4bd339e37bd4d6d31408d459ec87872b5':
|
2014-09-19 07:35:42 +00:00 |
|
Maurice Lam
|
a9653f946e
|
am b3f7de50 : am 9bfbf642 : am 24956de0 : am 95b283aa : am 795511ec : [WifiSetup] Disable app starting window
* commit 'b3f7de50ab806abb388b801e786208526a2f8730':
|
2014-09-19 07:35:40 +00:00 |
|
PauloftheWest
|
a6d64b372e
|
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':
|
2014-09-19 07:18:17 +00:00 |
|
Prem Kumar
|
5540b3e610
|
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':
|
2014-09-19 06:52:17 +00:00 |
|
John Spurlock
|
c4dbed50ce
|
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':
|
2014-09-19 06:52:16 +00:00 |
|
Tyler Gunn
|
cfb4709e2b
|
am 0c079321 : am 2b3505ed : am 8bad5a2d : am 86e452f9 : am 3e71b197 : Renaming Telecomm to Telecom.
* commit '0c07932111b94cfcc0bceabce7fd3d77883717bc':
|
2014-09-19 06:52:15 +00:00 |
|
Paul Lawrence
|
530fe251ec
|
am 158a291f : am 36d8bd3b : am db51c76a : am 7f4c4fb5 : am c64c9808 : Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
* commit '158a291f63c90d2979b1e7bffe40d0d29a38d366':
|
2014-09-19 06:20:04 +00:00 |
|
Kenny Guy
|
6ead5ba6d9
|
am 9d266fb8 : am daa4a466 : am 28d2fa62 : am 1ede808c : am db9e3f68 : Merge "Fix crash when showing accounts." into lmp-dev
* commit '9d266fb852343abd5d1ae2152eabb74c7421b545':
|
2014-09-19 06:20:03 +00:00 |
|
Alexandra Gherghina
|
739d6c7dca
|
am 60422087 : am 7a09535c : am cd321d81 : am 69af2c6a : am f738895d : Merge "Switch to using system-wide default user icons" into lmp-dev
* commit '60422087202bee68b6ffea07c8f1a4edc917cd33':
|
2014-09-19 06:20:02 +00:00 |
|
PauloftheWest
|
e9e3ce934a
|
am 8d8c5669 : am e438c383 : am 6c1d69ba : am 9f96ac6f : am 37b1253a : Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev
* commit '8d8c566934636bd946eec8b4182f0ed7d2a577ed':
|
2014-09-19 06:19:26 +00:00 |
|
Dianne Hackborn
|
5a6d466926
|
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':
|
2014-09-19 06:19:25 +00:00 |
|
Svetoslav
|
499e711161
|
am c73b179d : am 0a91a8d2 : am c33aef20 : am c50841ca : am 85dcef12 : Fix settings crash in print job screen.
* commit 'c73b179d59299a89846a9a7157dfdb2a13c1392d':
|
2014-09-19 06:19:23 +00:00 |
|
Vinit Deshpande
|
07f3cfbdb6
|
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':
|
2014-09-19 06:19:22 +00:00 |
|
Svetoslav
|
edeba266c2
|
am 3ade85ec : am 9af0fce6 : am 536cb798 : am 842e9d04 : am 72cfbcb4 : Merge "Fix print icons in settings." into lmp-dev
* commit '3ade85ec739837ec33c161968480ff5e7c4f8184':
|
2014-09-19 06:19:21 +00:00 |
|
Carlos Valdivia
|
91b00518c6
|
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':
|
2014-09-19 06:19:19 +00:00 |
|
Baligh Uddin
|
baceb2b6f4
|
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':
|
2014-09-19 06:19:18 +00:00 |
|
Dan Sandler
|
e9f080e5b1
|
am d446e475 : am fecd8989 : am 99e467a7 : am e98bee54 : am 1fb51987 : Merge "Show a better list of apps." into lmp-dev
* commit 'd446e4750aeaec25aa8deb98b0e0e3ef38f7765e':
|
2014-09-19 06:19:17 +00:00 |
|
Zoltan Szatmary-Ban
|
c5155ee936
|
am f51abf9a : am bc8f3d08 : am 118cf516 : am 55cd479d : am cf911d10 : Merge "Check for DeviceAdminInfo type before casting" into lmp-dev
* commit 'f51abf9a6449cf83fa795c2b4ac10c165840853a':
|
2014-09-19 06:19:16 +00:00 |
|
Zoltan Szatmary-Ban
|
3eea8cc714
|
am 5b792c6b : am 23496243 : am b2259b3a : am b46eeeb7 : am f572fdd1 : Merge "Fixing Trusted Credentials Settings crash" into lmp-dev
* commit '5b792c6b817f10151c380ae63ce7f3852096f159':
|
2014-09-19 06:19:15 +00:00 |
|
Fabrice Di Meglio
|
1fc61ebe86
|
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':
|
2014-09-19 06:19:13 +00:00 |
|
PauloftheWest
|
381a3e276b
|
am a90713df : am 08455c57 : am c1806600 : am 23d0ac44 : am b2197d90 : Added bluetooth_device_settings_header to fix build breakage.
* commit 'a90713df317928c6ccae9b5e32853a277e5ccc01':
|
2014-09-19 06:19:12 +00:00 |
|
Jim Miller
|
8b928d50ac
|
am c31f5615 : am 0787af48 : am 825eb63c : am f496ae94 : am ca03758e : Merge "Keep unlock attempt count after configuration change" into lmp-dev
* commit 'c31f5615815d7a7dce7e6045f8db7d1cb1adefd4':
|
2014-09-19 06:19:11 +00:00 |
|