Dianne Hackborn
|
9344eb4534
|
am 7f45b55d: (-s ours) am 8500822b: Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev
* commit '7f45b55dd8039ad1a62d88f36b8c6d2733dbb13b':
|
2015-08-27 11:36:07 +00:00 |
|
Maurice Lam
|
9ee252e863
|
am ef906938: (-s ours) am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
* commit 'ef906938955dcd95ed76e750d7e7b812d8ab926a':
|
2015-08-27 11:36:05 +00:00 |
|
Dianne Hackborn
|
838c4a2e70
|
am ef54ab61: (-s ours) am be4df036: Fix issue #23037899: Support for Battery Optimization permission + Dialog
* commit 'ef54ab616a8bd0e68fca50529054da895584bd9f':
|
2015-08-27 11:36:04 +00:00 |
|
Dianne Hackborn
|
9c0a7f91a9
|
am f6649472: (-s ours) am ba38155d: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev
* commit 'f664947291c1e951efddbffa2d073806e691003b':
|
2015-08-27 11:36:02 +00:00 |
|
Dianne Hackborn
|
e81e1816c8
|
am 6aeabbf2: (-s ours) am 996e285c: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev
* commit '6aeabbf2d2166e06ab742bdfaf94f0a9f383f891':
|
2015-08-27 11:36:00 +00:00 |
|
Julia Reynolds
|
b88ee9bd79
|
am 0a27e57d: (-s ours) am 2557d8a2: Merge "Wrap text on long preferences." into mnc-dev
* commit '0a27e57dd98cabf2d5f5bbedf1bd5da8df3b856a':
|
2015-08-27 11:35:59 +00:00 |
|
Jason Monk
|
06e661fadc
|
am 656145a0: (-s ours) am cf1e22f4: Merge "Remove extra help & feedback menu from power usage" into mnc-dev
* commit '656145a0e0973e0a77f3818fcf7670c638ef2fe0':
|
2015-08-27 11:35:57 +00:00 |
|
Pavel Zhamaitsiak
|
dd38b4d4ed
|
am 667be5d6: (-s ours) am 8cf54264: Merge "Ensure that listener is removed only if it was added" into mnc-dev
* commit '667be5d6bfedc9b290cfbc3f9fd533ac7da86920':
|
2015-08-27 11:35:55 +00:00 |
|
Jeff Sharkey
|
5a9e0e8236
|
am e56724ba: (-s ours) am 67f0739c: Merge "Block moving when already in progress." into mnc-dev
* commit 'e56724ba4687d29440cb52e398c92a21b4f5a117':
|
2015-08-27 11:35:53 +00:00 |
|
Billy Lau
|
a75c60d7dd
|
am 2cbb3c86: (-s ours) am a59f39fc: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
* commit '2cbb3c868d5b64366d7a5f0d43ccb92c5f2ada5b':
|
2015-08-27 11:35:50 +00:00 |
|
Dianne Hackborn
|
528a2548b8
|
am e426005b: (-s ours) am e7a5966a: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev
* commit 'e426005beb233748d866ce7eb2515f4388ac1da2':
|
2015-08-27 11:35:47 +00:00 |
|
Julia Reynolds
|
2af5aa09a0
|
am a9490b68: (-s ours) am 5ab0e183: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
* commit 'a9490b686017870f0129398fff08bbbba3d02b0d':
|
2015-08-27 11:35:45 +00:00 |
|
Geoff Mendal
|
ab74a87181
|
am acf198a7: (-s ours) am 2d546b77: (-s ours) Import translations. DO NOT MERGE
* commit 'acf198a7ac3d9d8adda62b7214829689a4d19d43':
|
2015-08-27 11:35:43 +00:00 |
|
Andres Morales
|
dcaf07d0bb
|
am af2ea2f4: (-s ours) am 4897fa87: Merge "fix CC for work profiles" into mnc-dev
* commit 'af2ea2f4ddc3d4261d7b71f65a6688e80185225e':
|
2015-08-27 11:35:42 +00:00 |
|
Geoff Mendal
|
14457a0aec
|
am 9acc740e: (-s ours) am 7930f872: (-s ours) Import translations. DO NOT MERGE
* commit '9acc740ed2153cfb2e5597d5c4787faa07fb4386':
|
2015-08-27 11:35:40 +00:00 |
|
Jason Monk
|
81a08e382a
|
am aceedc73: (-s ours) am 888673bd: Hide show/hide system from battery optimizations list
* commit 'aceedc73aeea2ab5f05a678e3c5db6b3f7cf562f':
|
2015-08-27 11:35:38 +00:00 |
|
Sanket Padawe
|
cac8f17210
|
am 086dde01: (-s ours) am 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '086dde011fa9edfab25b0f7c207b6b1f14e3f32b':
|
2015-08-27 11:35:35 +00:00 |
|
Ajay Panicker
|
5fca7d06fe
|
am 8c0139b1: (-s ours) am cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
* commit '8c0139b1c84cfe5b389d794e60c483bc3c72b132':
|
2015-08-27 11:35:32 +00:00 |
|
Jason Monk
|
7d474282be
|
am 12c70b7c: (-s ours) am 244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev
* commit '12c70b7c77936c2590cf5d011b411829df61f25b':
|
2015-08-27 11:35:29 +00:00 |
|
Maurice Lam
|
6f9b92f83b
|
am a2f78eaf: (-s ours) am 311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-dev
* commit 'a2f78eafca1008555315517c5e1ef7ef0bfb1ca0':
|
2015-08-27 11:35:27 +00:00 |
|
Maurice Lam
|
2d5c9de6b5
|
am 6863fac2: (-s ours) am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
* commit '6863fac224d2b3cdc95694bea233199bc8a92de8':
|
2015-08-27 11:35:25 +00:00 |
|
Nick Kralevich
|
35e08b441c
|
am 8a85dcc9: (-s ours) am 1adca55f: Merge "UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER" into mnc-dev
* commit '8a85dcc9b45030b3f8f9921a09a61502334db65a':
|
2015-08-27 11:35:23 +00:00 |
|
Jason Monk
|
d50c024c10
|
am 25adfb00: (-s ours) am f61ead7a: Make sure accessibility service desc isn\'t clickable
* commit '25adfb004d6cec8c872eeafe83100a92c19b1416':
|
2015-08-27 11:35:21 +00:00 |
|
Dianne Hackborn
|
e885c27c08
|
am 50cb6411: (-s ours) am f426126a: Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev
* commit '50cb6411fa8631400f13a7f389a681dfba74f87a':
|
2015-08-27 11:35:19 +00:00 |
|
Chris Tate
|
8c2593e0da
|
am 5977cfdf: (-s ours) am 6e64e22e: Merge "Explain properly when apps can open multiple hosts\' links" into mnc-dev
* commit '5977cfdf919dd20116644ef0fecb77e45e0813f7':
|
2015-08-27 11:35:15 +00:00 |
|
Prem Kumar
|
dc30961b43
|
am 0694de93: (-s ours) am eed361bb: Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev
* commit '0694de939724a497f2f1ed86ba83c11a5710e80c':
|
2015-08-27 11:35:12 +00:00 |
|
Maurice Lam
|
98d6d7c9d4
|
am 01495108: (-s ours) am 87fadbe6: [Fingerprint] Help text for backup screen lock
* commit '01495108f153313f61814dac33dd0711eb50616a':
|
2015-08-27 11:35:09 +00:00 |
|
Geoff Mendal
|
ad6eb955e4
|
am a5af1375: (-s ours) am c493f042: (-s ours) Import translations. DO NOT MERGE
* commit 'a5af13758a371e9e162d56b34b07a836f473347f':
|
2015-08-27 11:35:07 +00:00 |
|
Vinit Deshpande
|
ac23c640b5
|
am 96ae93e4: (-s ours) am b74c0b2a: Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev
* commit '96ae93e4d602f15c2878c1788abab3917d3efbf2':
|
2015-08-27 11:35:05 +00:00 |
|
Jim Miller
|
6b120f324e
|
am fe87f19b: (-s ours) am efaa19d9: Fix fingerprint enrolling bug.
* commit 'fe87f19bc802792d54d5397b8acee8b02a6022c0':
|
2015-08-27 11:35:03 +00:00 |
|
Maurice Lam
|
d9e42d64ea
|
am e1548aba: (-s ours) am 88832a3d: Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev
* commit 'e1548aba28e5362d35e6980c9238b783ef3426a0':
|
2015-08-27 11:35:01 +00:00 |
|
Geoff Mendal
|
78ed71c68a
|
am b02410c4: (-s ours) am 13cbe053: (-s ours) Import translations. DO NOT MERGE
* commit 'b02410c44f384bd9a59707818593938d05163244':
|
2015-08-27 11:34:59 +00:00 |
|
Jeff Sharkey
|
109572010b
|
am bf49bdf9: (-s ours) am c7e59e52: Merge "Let Settings measure transient free space." into mnc-dev
* commit 'bf49bdf9e8cf50c74a92b58ba37621fd9e0f9c0e':
|
2015-08-27 11:34:55 +00:00 |
|
Maurice Lam
|
605396b542
|
am 0074510a: (-s ours) am 997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
* commit '0074510a57432544ce77ab33fa08ac47f569398b':
|
2015-08-27 11:34:54 +00:00 |
|
Geoff Mendal
|
02b262d4bc
|
am 197cfdbd: (-s ours) am 6b0a2d21: (-s ours) Import translations. DO NOT MERGE
* commit '197cfdbd2c709cc6198f526dff47d53836b0d251':
|
2015-08-27 11:34:52 +00:00 |
|
Fyodor Kupolov
|
bf68f8d4c8
|
am b3fd5e17: (-s ours) am c3067882: Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
* commit 'b3fd5e172b8a5a794b167737ebe76fbe13d2c449':
|
2015-08-27 11:34:49 +00:00 |
|
Jorim Jaggi
|
3ee1bc7d21
|
am 93eff27e: (-s ours) am 92f9bdc6: Merge "Add dialog to confirm last fingerprint removal" into mnc-dev
* commit '93eff27e2a4ddea1462cf14a048c49cffa06f8ae':
|
2015-08-27 11:34:47 +00:00 |
|
Jeff Sharkey
|
d4dc3e3b1e
|
am 43c41edf: (-s ours) am bb9d6b90: Merge "Refresh after clearing, tweak warn threshold." into mnc-dev
* commit '43c41edfc76b7135d507d3b11d58ed214ff89ba9':
|
2015-08-27 11:34:45 +00:00 |
|
Billy Lau
|
aaa1621b6b
|
am 62d04c00: (-s ours) am eb372c93: Merge "Bug: 22718745 Intents to \'draw over other apps\' should go direct to the package\'s page instead of the top level one" into mnc-dev
* commit '62d04c0012d15d30c3e28364ac83ce5329aba8d1':
|
2015-08-27 11:34:43 +00:00 |
|
Jason Monk
|
6e27d59553
|
am 2ff120a3: (-s ours) am 19128bd1: Extend char limit by small amount
* commit '2ff120a33f25f5e64de72aeefe92663b233de335':
|
2015-08-27 11:34:40 +00:00 |
|
Geoff Mendal
|
c60a59235d
|
am 149ceebc: (-s ours) am 597d75ea: (-s ours) Import translations. DO NOT MERGE
* commit '149ceebcedcdc986d89c3d983faf1c1a648406b8':
|
2015-08-27 11:34:38 +00:00 |
|
Geoff Mendal
|
4475b7712f
|
am e6f7a8bf: (-s ours) am 53f771d8: (-s ours) Import translations. DO NOT MERGE
* commit 'e6f7a8bff7fbeebdf40e46e4a210467bfe085fc2':
|
2015-08-27 11:34:36 +00:00 |
|
Jorim Jaggi
|
8f21284807
|
am 7b48a1c6: (-s ours) am 23ace013: Merge "Adjustments for find sensor screen" into mnc-dev
* commit '7b48a1c6f44e64136f705943ff8b046766e0ed2e':
|
2015-08-27 11:34:34 +00:00 |
|
Fyodor Kupolov
|
c4f1eaaf03
|
am 2c5f5921: (-s ours) am 2731a18f: Merge "brightness status not refresh in powercontrol widget"
* commit '2c5f59211f632bd3e2ce9cfe64101ea4e1f1a1a3':
|
2015-08-27 11:34:33 +00:00 |
|
Maurice Lam
|
aa69ebb566
|
am 862343bc: (-s ours) am 3760e5e7: Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev
* commit '862343bcadc6a19ea0f1e18506eb8a64f32872d8':
|
2015-08-27 11:34:31 +00:00 |
|
Julia Reynolds
|
1d85676b57
|
am 4254518a: (-s ours) am 00b5488c: Merge "Change assist app warning message text" into mnc-dev
* commit '4254518a759003c2e3c6fd60569ce68fe2c96424':
|
2015-08-27 11:34:29 +00:00 |
|
Julia Reynolds
|
1281463f6d
|
am 06e59246: (-s ours) am ae422fd0: Merge "Change \'data\' label to \'data usage\'." into mnc-dev
* commit '06e5924632eb7a9698790664ed2b4f865e832061':
|
2015-08-27 11:34:28 +00:00 |
|
Chris Wren
|
54aedb67fd
|
am 3605c435: (-s ours) am 2a56d7f2: Merge "fix InactiveApps instrumentation" into mnc-dev
* commit '3605c4356a339626593ae52813b2574a5a355370':
|
2015-08-27 11:34:27 +00:00 |
|
Martijn Coenen
|
68da3bcbd5
|
am 3e7d3faf: (-s ours) am edb2668c: Merge "Add contactless symbol to NFC resources." into mnc-dev
* commit '3e7d3faf20c321d87509c04a74fa05f048309f4d':
|
2015-08-27 11:34:25 +00:00 |
|
Julia Reynolds
|
d16f564d0b
|
am 0a52b7b3: (-s ours) am 300d6fd9: Merge "Use pattern visibility setting on confirm pattern screen." into mnc-dev
* commit '0a52b7b3c4d520d0cf4c970ebe1f2f40e89bc773':
|
2015-08-27 11:34:24 +00:00 |
|