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 |
|
Julia Reynolds
|
468bf8393b
|
am 72bb3a69: (-s ours) am f889faaf: Merge "Bump string char limit." into mnc-dev
* commit '72bb3a69248b4ffbaa3ac597eb557bc1f7a4db03':
|
2015-08-27 11:34:23 +00:00 |
|
Martijn Coenen
|
67d37ec893
|
am 274d9246: (-s ours) am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev
* commit '274d92467a92a5c88b1d28a5aedb310dc2a3d714':
|
2015-08-27 11:34:21 +00:00 |
|
Zach Johnson
|
965dd0f3b4
|
am 4fd8d1e1: (-s ours) am a425e864: Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev
* commit '4fd8d1e1474948cbcd284098d1fd68d2b5ec1b8f':
|
2015-08-27 11:34:20 +00:00 |
|
Julia Reynolds
|
aa13944984
|
am 1ae73faf: (-s ours) am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev
* commit '1ae73fafe74782ca7bb34c40141cf231adff5e67':
|
2015-08-27 11:34:19 +00:00 |
|
Julia Reynolds
|
3ae4f04488
|
am b5063920: (-s ours) am feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev
* commit 'b506392025219402d5010e7786134321230ce519':
|
2015-08-27 11:34:17 +00:00 |
|
Jorim Jaggi
|
0a3fa3d9a3
|
am 9fd7d6fd: (-s ours) am 5458688c: Merge "Make fingerprint error text a live region" into mnc-dev
* commit '9fd7d6fd63829d96de143250a7092b7b49d526fc':
|
2015-08-27 11:34:16 +00:00 |
|
Jorim Jaggi
|
111e82dfce
|
am 4088cef8: (-s ours) am 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev
* commit '4088cef80f62b5381df3b54b4379fa46c3c390d9':
|
2015-08-27 11:34:15 +00:00 |
|
Jorim Jaggi
|
4fdd5cc6e0
|
am a77130f7: (-s ours) am 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev
* commit 'a77130f7e40bb5cb16b2379d0739f85402906d18':
|
2015-08-27 11:34:13 +00:00 |
|
Jorim Jaggi
|
3ae8ae371f
|
am 69941efa: (-s ours) am 730389bd: Merge "Adjust choose assist app string" into mnc-dev
* commit '69941efa8bf2a41c03293aa6986fbe6d873baa2d':
|
2015-08-27 11:34:12 +00:00 |
|
Jorim Jaggi
|
2531fe7c45
|
am e4e8bb34: (-s ours) am dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev
* commit 'e4e8bb3486bd3642baa88a06c529cb428c27005f':
|
2015-08-27 11:34:11 +00:00 |
|
Selim Cinek
|
da7bbe6810
|
am d2b6e1ac: (-s ours) am 596ce9ba: Merge "Autocapitalizing the fingerprint names now" into mnc-dev
* commit 'd2b6e1acd0ca0ebd3cfc64295dc19ef2cf1c4455':
|
2015-08-27 11:34:10 +00:00 |
|
Selim Cinek
|
5aae3caea2
|
am 412eb5df: (-s ours) am a8c7c8c8: Merge "Added content description for the fingerprint icon" into mnc-dev
* commit '412eb5dfdea71902ac64a1392cf9d791b0a5f647':
|
2015-08-27 11:34:08 +00:00 |
|
Selim Cinek
|
73de309dc9
|
am e0f552c1: (-s ours) am 95ddf903: Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev
* commit 'e0f552c140c98ad20d97dd139606a4fbf8451982':
|
2015-08-27 11:34:07 +00:00 |
|
Jorim Jaggi
|
ff53e1415a
|
am 607e7963: (-s ours) am 58d1995c: Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev
* commit '607e796331ce7c32b989d02efb9e303fc2c71bef':
|
2015-08-27 11:34:06 +00:00 |
|
Jason Monk
|
5c87cdd8a7
|
am 9a5dc80d: (-s ours) am 3b521b60: Merge "Battery summary - tint uid 0 icon" into mnc-dev
* commit '9a5dc80d050fb63fa5f2c8b5877b4b9ecc3123a8':
|
2015-08-27 11:34:04 +00:00 |
|
Jason Monk
|
c3c9dbd31e
|
am 9d5907d0: (-s ours) am 08cb3983: Merge "Update battery optimization strings" into mnc-dev
* commit '9d5907d03edfec6a2823f908cade6c458644da0b':
|
2015-08-27 11:34:03 +00:00 |
|
Sanket Padawe
|
759e3fab0b
|
am 9cbb3549: (-s ours) am ca258251: Merge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev
* commit '9cbb3549369b412525dc6485c6b6eba189208e76':
|
2015-08-27 11:34:02 +00:00 |
|
Julia Reynolds
|
ff5823f58a
|
am 0b674961: (-s ours) am 9a1c0dce: Handle app uninstall via Storage & USB.
* commit '0b6749614c3ed78bebf43ab0d9574ace2087c3fd':
|
2015-08-27 11:34:00 +00:00 |
|
Geoff Mendal
|
b1c078f479
|
am a8b7c118: (-s ours) am e37e1232: (-s ours) Import translations. DO NOT MERGE
* commit 'a8b7c118f5551797f3fba028ed78162eca346fa4':
|
2015-08-27 11:33:59 +00:00 |
|