Commit Graph

473389 Commits

Author SHA1 Message Date
Automerger Merge Worker
92a472fa0e Merge "Sanitize Bluetooth device names without regex" am: 6bd37ba788 am: b8f0a92e0b am: 65d3f63d76 am: f0e75d8d5e am: 5c510955ee
Change-Id: I8fb1dd9863b558a4249cc087f98b1cade498509b
2020-03-01 04:23:10 +00:00
Automerger Merge Worker
5c510955ee Merge "Sanitize Bluetooth device names without regex" am: 6bd37ba788 am: b8f0a92e0b am: 65d3f63d76 am: f0e75d8d5e
Change-Id: I9e3422c347751638f489670a01a2790d7b7f534f
2020-03-01 04:10:01 +00:00
Automerger Merge Worker
f0e75d8d5e Merge "Sanitize Bluetooth device names without regex" am: 6bd37ba788 am: b8f0a92e0b am: 65d3f63d76
Change-Id: I45dfe9a4cf9b904e4db888dcdf777224c8432aea
2020-03-01 03:56:50 +00:00
Automerger Merge Worker
65d3f63d76 Merge "Sanitize Bluetooth device names without regex" am: 6bd37ba788 am: b8f0a92e0b
Change-Id: I044fa2a33359b90724e68f89b1762e0e2b3b196a
2020-03-01 03:47:30 +00:00
Automerger Merge Worker
b8f0a92e0b Merge "Sanitize Bluetooth device names without regex" am: 6bd37ba788
Change-Id: I97c50cc31e681e53cc74d76803e3e24566b7e5dd
2020-03-01 03:34:53 +00:00
Treehugger Robot
6bd37ba788 Merge "Sanitize Bluetooth device names without regex" 2020-03-01 03:21:38 +00:00
TreeHugger Robot
7493a582a2 Merge "Import translations. DO NOT MERGE" 2020-03-01 02:13:30 +00:00
Automerger Merge Worker
2ec0c906db Merge "Merge "Merge "Add COMPANION_APPROVE_WIFI_CONNECTIONS to shell permissions" into rvc-dev am: 5dbabb62a6 am: 2ec01d4139" into rvc-d1-dev-plus-aosp am: 397ea5f0b3" into rvc-qpr-dev-plus-aosp am: a4fef6992c
Change-Id: I781c6f110bd4fa5669f229cf05cdb414ad0ca3ca
2020-03-01 00:41:14 +00:00
Automerger Merge Worker
eaa3fb7d24 Merge "Add COMPANION_APPROVE_WIFI_CONNECTIONS to shell permissions" into rvc-dev am: 5dbabb62a6 am: 2ec01d4139 am: 4c9b6a74fd am: 166c7b07f3
Change-Id: I36abc146b5c4ce7ad2a1dd9008de13c1ab49521b
2020-03-01 00:40:45 +00:00
Automerger Merge Worker
a1eb5c664b Merge "Add COMPANION_APPROVE_WIFI_CONNECTIONS to shell permissions" into rvc-dev am: 5dbabb62a6 am: 5cd20c9e30 am: a8624ea22b am: b4aba3db4f
Change-Id: Ief4086a4e0f27c7838439882dce6ef0167e41c34
2020-03-01 00:40:29 +00:00
Automerger Merge Worker
a4fef6992c Merge "Merge "Merge "Add COMPANION_APPROVE_WIFI_CONNECTIONS to shell permissions" into rvc-dev am: 5dbabb62a6 am: 2ec01d4139" into rvc-d1-dev-plus-aosp am: 397ea5f0b3" into rvc-qpr-dev-plus-aosp 2020-03-01 00:26:16 +00:00
Automerger Merge Worker
9db79b14ec Merge "Merge "Add COMPANION_APPROVE_WIFI_CONNECTIONS to shell permissions" into rvc-dev am: 5dbabb62a6 am: 2ec01d4139" into rvc-d1-dev-plus-aosp am: 397ea5f0b3
Change-Id: I933836c7c489ae86305946d367ac4d57eed7dd49
2020-03-01 00:26:11 +00:00
Automerger Merge Worker
166c7b07f3 Merge "Add COMPANION_APPROVE_WIFI_CONNECTIONS to shell permissions" into rvc-dev am: 5dbabb62a6 am: 2ec01d4139 am: 4c9b6a74fd
Change-Id: I25fb3750f1f840d1fd949472cf834ccf328772de
2020-03-01 00:26:02 +00:00
Automerger Merge Worker
b4aba3db4f Merge "Add COMPANION_APPROVE_WIFI_CONNECTIONS to shell permissions" into rvc-dev am: 5dbabb62a6 am: 5cd20c9e30 am: a8624ea22b
Change-Id: I96713be8fee17dc81f7c872a5211533a8181ddab
2020-03-01 00:25:51 +00:00
Automerger Merge Worker
397ea5f0b3 Merge "Merge "Add COMPANION_APPROVE_WIFI_CONNECTIONS to shell permissions" into rvc-dev am: 5dbabb62a6 am: 2ec01d4139" into rvc-d1-dev-plus-aosp 2020-03-01 00:11:16 +00:00
Automerger Merge Worker
7614ba1e2e Merge "Add COMPANION_APPROVE_WIFI_CONNECTIONS to shell permissions" into rvc-dev am: 5dbabb62a6 am: 2ec01d4139
Change-Id: I797dc8b53335dc0a64b25869e94405c77b5b2261
2020-03-01 00:11:13 +00:00
Automerger Merge Worker
4c9b6a74fd Merge "Add COMPANION_APPROVE_WIFI_CONNECTIONS to shell permissions" into rvc-dev am: 5dbabb62a6 am: 2ec01d4139
Change-Id: Ie185612bcc90f7c1811d6d8bf99e1140114babb5
2020-03-01 00:11:07 +00:00
Automerger Merge Worker
a8624ea22b Merge "Add COMPANION_APPROVE_WIFI_CONNECTIONS to shell permissions" into rvc-dev am: 5dbabb62a6 am: 5cd20c9e30
Change-Id: I61ae95c2980e6871dad2548131ceba660bc42d1c
2020-03-01 00:11:07 +00:00
Automerger Merge Worker
5cd20c9e30 Merge "Add COMPANION_APPROVE_WIFI_CONNECTIONS to shell permissions" into rvc-dev am: 5dbabb62a6
Change-Id: I87eab50ae534e584e3d5e0d4b2d66e87dee7442a
2020-02-29 23:59:39 +00:00
Automerger Merge Worker
2ec01d4139 Merge "Add COMPANION_APPROVE_WIFI_CONNECTIONS to shell permissions" into rvc-dev am: 5dbabb62a6
Change-Id: Ide7b036d0f551e50b37172256c2a9a1ee62c4ab9
2020-02-29 23:59:34 +00:00
Bill Yi
7847675e2e Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I67f57a23e53fd15ac3888dd04e3558827ad31102
2020-02-29 15:46:16 -08:00
Paul Murphy
5dbabb62a6 Merge "Add COMPANION_APPROVE_WIFI_CONNECTIONS to shell permissions" into rvc-dev 2020-02-29 23:42:23 +00:00
Automerger Merge Worker
e35a0a91a3 Merge changes from topic "am-f52d7c9e87f04a0aa79e1ff29e6613fe" into rvc-qpr-dev-plus-aosp am: a2e1c10bd3
Change-Id: I6dc0ef610e2413bbeebc6f38d8f91f62bcb06150
2020-02-29 22:40:18 +00:00
Automerger Merge Worker
e9e7149b91 [automerger skipped] DO NOT MERGE: Revert Move startInput for WINDOW_FOCUS_GAIN to background thread am: 344858dd9c -s ours am: 87a31d58be am: 21406384a7 am: 16cddc7e15 am: 739b66def4 -s ours
am skip reason: subject contains skip directive

Change-Id: I07fe86c53c68c50f306a8c4d7a0642fac453d8a3
2020-02-29 22:40:13 +00:00
Automerger Merge Worker
3d4919785e Merge changes from topic "revert-9783082-1574797358199-802c4081-VGXGMNZIXS" into qt-qpr1-dev am: a373984e96 am: d03d6628e4 am: 30b1246586 am: f9bb155fe2 am: bd63e9fd53
Change-Id: I7a8f2a5b95a908caad2f215f889dd98b1bf7a50c
2020-02-29 22:39:54 +00:00
Automerger Merge Worker
bb532a7c94 [automerger skipped] DO NOT MERGE: Revert Move startInput for WINDOW_FOCUS_GAIN to background thread am: 344858dd9c -s ours am: 87a31d58be am: fa49660101 am: 48b3c2cadd am: e2a4fb03ac -s ours
am skip reason: subject contains skip directive

Change-Id: I45946390b9ed7e5a15d17c89458b945870830e82
2020-02-29 22:39:52 +00:00
Automerger Merge Worker
cee5fd8f81 Merge changes from topic "revert-9783082-1574797358199-802c4081-VGXGMNZIXS" into qt-qpr1-dev am: a373984e96 am: d03d6628e4 am: 30b1246586 am: f35ccd22a1 am: 8ed66addea
Change-Id: Ieb5fc407b6ae40ec8a82a5e2d08764c406851ce9
2020-02-29 22:39:38 +00:00
Automerger Merge Worker
08e57abca5 [automerger skipped] DO NOT MERGE: Revert Move startInput for WINDOW_FOCUS_GAIN to background thread am: 344858dd9c -s ours am: 87a31d58be am: fa49660101 am: 0596cec192 am: 2d33c399bd -s ours
am skip reason: subject contains skip directive

Change-Id: If16d1d575c4e3e5f822c6aa1fe49bb6b0905cb9b
2020-02-29 22:39:36 +00:00
Automerger Merge Worker
a2e1c10bd3 Merge changes from topic "am-f52d7c9e87f04a0aa79e1ff29e6613fe" into rvc-qpr-dev-plus-aosp
* changes:
  Merge changes from topic "am-712d2cc7eeac4c51897ba4b5d23a5f9f" into rvc-d1-dev-plus-aosp am: 1d5aed603b
  [automerger skipped] DO NOT MERGE: Revert Move startInput for WINDOW_FOCUS_GAIN to background thread am: 344858dd9c -s ours am: 87a31d58be am: 21406384a7 am: 16cddc7e15
2020-02-29 22:27:59 +00:00
Automerger Merge Worker
32d628ca08 Merge changes from topic "am-712d2cc7eeac4c51897ba4b5d23a5f9f" into rvc-d1-dev-plus-aosp am: 1d5aed603b
Change-Id: I13dbed88a393bcdea438e847cf9abf8935f0d088
2020-02-29 22:27:55 +00:00
Automerger Merge Worker
739b66def4 [automerger skipped] DO NOT MERGE: Revert Move startInput for WINDOW_FOCUS_GAIN to background thread am: 344858dd9c -s ours am: 87a31d58be am: 21406384a7 am: 16cddc7e15
Change-Id: I07319cf21dd8cadd9b52e0d0af1e65b46b891bb2
2020-02-29 22:27:50 +00:00
Automerger Merge Worker
bd63e9fd53 Merge changes from topic "revert-9783082-1574797358199-802c4081-VGXGMNZIXS" into qt-qpr1-dev am: a373984e96 am: d03d6628e4 am: 30b1246586 am: f9bb155fe2
Change-Id: I8964b959a1959fe53e40a255f40f485f307eee47
2020-02-29 22:27:47 +00:00
Automerger Merge Worker
e2a4fb03ac [automerger skipped] DO NOT MERGE: Revert Move startInput for WINDOW_FOCUS_GAIN to background thread am: 344858dd9c -s ours am: 87a31d58be am: fa49660101 am: 48b3c2cadd
Change-Id: Iab156d7b877e99c38daa60fd5098d19af98b0e48
2020-02-29 22:27:44 +00:00
Automerger Merge Worker
8ed66addea Merge changes from topic "revert-9783082-1574797358199-802c4081-VGXGMNZIXS" into qt-qpr1-dev am: a373984e96 am: d03d6628e4 am: 30b1246586 am: f35ccd22a1
Change-Id: I2bfa3d9a0eff2a1f0ca3fb6245ec0a51dacfa11b
2020-02-29 22:27:35 +00:00
Automerger Merge Worker
2d33c399bd [automerger skipped] DO NOT MERGE: Revert Move startInput for WINDOW_FOCUS_GAIN to background thread am: 344858dd9c -s ours am: 87a31d58be am: fa49660101 am: 0596cec192
Change-Id: Ic30715c62ba0207311413e0489e9cd9a13cb9629
2020-02-29 22:27:33 +00:00
Automerger Merge Worker
f27bdad836 Merge "Merge "Ignore falsing manager for UiAutomator tests" into rvc-dev am: 7f1c80da68 am: e9b9e9b15a am: 0f460e2c59" into rvc-qpr-dev-plus-aosp am: 1aabdcdcc0
Change-Id: I8cd96a13c18ba6d6afec1020df9fd63d90157adc
2020-02-29 22:16:08 +00:00
Automerger Merge Worker
bd79e09100 Merge "Ignore falsing manager for UiAutomator tests" into rvc-dev am: 7f1c80da68 am: 4e1eb89532 am: 2e9480ef52 am: 449b7d581f
Change-Id: Ic928df54a455f9a21d4b5bdb38bb1a4f0809e3c8
2020-02-29 22:15:47 +00:00
Automerger Merge Worker
51382c84df Merge "Ignore falsing manager for UiAutomator tests" into rvc-dev am: 7f1c80da68 am: 4e1eb89532 am: b01abe8c5b am: 68648c1906
Change-Id: Id8c7eff1771c2a5d5155efe7a5f6b44b1f7d37d5
2020-02-29 22:15:36 +00:00
Automerger Merge Worker
1d5aed603b Merge changes from topic "am-712d2cc7eeac4c51897ba4b5d23a5f9f" into rvc-d1-dev-plus-aosp
* changes:
  Merge changes from topic "revert-9783082-1574797358199-802c4081-VGXGMNZIXS" into qt-qpr1-dev am: a373984e96 am: d03d6628e4 am: 3a954cda4d
  [automerger skipped] DO NOT MERGE: Revert Move startInput for WINDOW_FOCUS_GAIN to background thread am: 344858dd9c -s ours am: 87a31d58be am: 21406384a7
2020-02-29 22:11:38 +00:00
Automerger Merge Worker
f9bb155fe2 Merge changes from topic "revert-9783082-1574797358199-802c4081-VGXGMNZIXS" into qt-qpr1-dev am: a373984e96 am: d03d6628e4 am: 30b1246586
Change-Id: I181d4447e49aa4417963af91dffd80f5da8ee1aa
2020-02-29 22:11:37 +00:00
Automerger Merge Worker
48b3c2cadd [automerger skipped] DO NOT MERGE: Revert Move startInput for WINDOW_FOCUS_GAIN to background thread am: 344858dd9c -s ours am: 87a31d58be am: fa49660101
Change-Id: I81496d04dc11ec2d78c561b1ab9110d2a29ad957
2020-02-29 22:11:34 +00:00
Automerger Merge Worker
d31695787f Merge changes from topic "revert-9783082-1574797358199-802c4081-VGXGMNZIXS" into qt-qpr1-dev am: a373984e96 am: d03d6628e4 am: 3a954cda4d
Change-Id: I444cf6a674d0b49893d36294064de6766ea2d357
2020-02-29 22:11:32 +00:00
Automerger Merge Worker
f35ccd22a1 Merge changes from topic "revert-9783082-1574797358199-802c4081-VGXGMNZIXS" into qt-qpr1-dev am: a373984e96 am: d03d6628e4 am: 30b1246586
Change-Id: Ie77f920cc12ef692bb2c8214a4854b7b8c82c7d6
2020-02-29 22:11:31 +00:00
Automerger Merge Worker
16cddc7e15 [automerger skipped] DO NOT MERGE: Revert Move startInput for WINDOW_FOCUS_GAIN to background thread am: 344858dd9c -s ours am: 87a31d58be am: 21406384a7
Change-Id: I0635d1cf49a7eaff34eb4dc09c25e1e09f0d5d82
2020-02-29 22:11:30 +00:00
Automerger Merge Worker
0596cec192 [automerger skipped] DO NOT MERGE: Revert Move startInput for WINDOW_FOCUS_GAIN to background thread am: 344858dd9c -s ours am: 87a31d58be am: fa49660101
Change-Id: Idc9bf948cae9bed529d1b9b47871a55c8ee2db7a
2020-02-29 22:11:28 +00:00
Automerger Merge Worker
1aabdcdcc0 Merge "Merge "Ignore falsing manager for UiAutomator tests" into rvc-dev am: 7f1c80da68 am: e9b9e9b15a am: 0f460e2c59" into rvc-qpr-dev-plus-aosp 2020-02-29 22:01:21 +00:00
Automerger Merge Worker
f93b194b4f Merge "Ignore falsing manager for UiAutomator tests" into rvc-dev am: 7f1c80da68 am: e9b9e9b15a am: 0f460e2c59
Change-Id: Ib5d841fa7dc9054e497a66fd76d776a34af83406
2020-02-29 22:01:16 +00:00
Automerger Merge Worker
449b7d581f Merge "Ignore falsing manager for UiAutomator tests" into rvc-dev am: 7f1c80da68 am: 4e1eb89532 am: 2e9480ef52
Change-Id: Iaffd59dce2a10600597d7487a4b931c0393ff4ed
2020-02-29 22:01:14 +00:00
Automerger Merge Worker
68648c1906 Merge "Ignore falsing manager for UiAutomator tests" into rvc-dev am: 7f1c80da68 am: 4e1eb89532 am: b01abe8c5b
Change-Id: Ibe76bb034e46a26daf1f91be5c5d91beae8a0885
2020-02-29 22:00:55 +00:00
Automerger Merge Worker
3a954cda4d Merge changes from topic "revert-9783082-1574797358199-802c4081-VGXGMNZIXS" into qt-qpr1-dev am: a373984e96 am: d03d6628e4
Change-Id: I4e6813fe53b8a0a6c19a182b5c412b3054415a5f
2020-02-29 21:55:45 +00:00