Commit Graph

70058 Commits

Author SHA1 Message Date
TreeHugger Robot
7d9810e7e8 Merge "Remove duplicate search result when search "Bubbles"" into rvc-dev am: 86b5034215 am: 5aa9c97a51 am: 473067cccd am: 0389ba88de
Change-Id: I3d6081eb24075624ffee163abbb53f5550b9a19b
2020-05-27 20:30:58 +00:00
TreeHugger Robot
8dec5e1cd9 Merge "Remove duplicate search result when search "Bubbles"" into rvc-dev am: 86b5034215 am: db857cb4f3 am: 204407ac5f am: e61ea3a7a0
Change-Id: I8f16e2f3ef3dc5f265360f5a4839fbaecb5fbc63
2020-05-27 20:30:11 +00:00
TreeHugger Robot
0389ba88de Merge "Remove duplicate search result when search "Bubbles"" into rvc-dev am: 86b5034215 am: 5aa9c97a51 am: 473067cccd
Change-Id: I5e77c7873c34ff035456ba5c7012da80524ed800
2020-05-27 20:08:08 +00:00
TreeHugger Robot
e61ea3a7a0 Merge "Remove duplicate search result when search "Bubbles"" into rvc-dev am: 86b5034215 am: db857cb4f3 am: 204407ac5f
Change-Id: I9ceb9a1dcb5ece95f94223f8630cf54c2494e494
2020-05-27 20:07:44 +00:00
TreeHugger Robot
204407ac5f Merge "Remove duplicate search result when search "Bubbles"" into rvc-dev am: 86b5034215 am: db857cb4f3
Change-Id: I7d2a1cad7fa4594a37d9abb34ae1967a81615187
2020-05-27 19:55:25 +00:00
TreeHugger Robot
473067cccd Merge "Remove duplicate search result when search "Bubbles"" into rvc-dev am: 86b5034215 am: 5aa9c97a51
Change-Id: I9d919cb43956cd88170cb40a7f9834d7900ee563
2020-05-27 19:55:13 +00:00
TreeHugger Robot
db857cb4f3 Merge "Remove duplicate search result when search "Bubbles"" into rvc-dev am: 86b5034215
Change-Id: I41b7d13a101e794285565c195967e76d35df45f1
2020-05-27 19:38:39 +00:00
TreeHugger Robot
5aa9c97a51 Merge "Remove duplicate search result when search "Bubbles"" into rvc-dev am: 86b5034215
Change-Id: Ic98a47b4767d649e574cf21c7f03aa817b678a0e
2020-05-27 19:38:12 +00:00
TreeHugger Robot
86b5034215 Merge "Remove duplicate search result when search "Bubbles"" into rvc-dev 2020-05-27 19:30:37 +00:00
Benedict Wong
0f3e7a5512 [automerger skipped] Merge "Hide IKEv2 VPN options if not supported" into rvc-dev am: 5e2f733aee -s ours am: 03bf3af139 -s ours am: a89340bf43 -s ours am: 537220db1e -s ours
am skip reason: Change-Id I3ef2e6144371596380351341e58c4ee84d49f39d with SHA-1 149cd3dd77 is in history

Change-Id: I8f37eb4bceba3d4fee85b775a4716ce94257a1b5
2020-05-27 18:22:26 +00:00
Automerger Merge Worker
68b1877994 Merge "[automerger skipped] Merge "Hide IKEv2 VPN options if not supported" into rvc-dev am: 5e2f733aee am: d7a50cb62f -s ours" into rvc-d1-dev-plus-aosp am: 0a1b12278a -s ours am: 0f1d7d33ee -s ours
am skip reason: Change-Id I3ef2e6144371596380351341e58c4ee84d49f39d with SHA-1 149cd3dd77 is in history

Change-Id: I5d3e1555a9585095dbcb5d83456e0794b1b9965c
2020-05-27 18:21:43 +00:00
Adam Bookatz
58f359648e Merge "Opening Multiuser doesn't toggle it on" into rvc-dev am: f8fd6156ae am: dcd4edc456 am: 0c794f99fd am: 62a3dea883
Change-Id: I6777e0551bf7f6811c6343ba751a2c44befe6e68
2020-05-27 18:20:52 +00:00
Benedict Wong
66adfe2c57 [automerger skipped] Merge "Hide IKEv2 VPN options if not supported" into rvc-dev am: 5e2f733aee am: d7a50cb62f am: d6cb162baa -s ours am: 7242fdf8e4 -s ours
am skip reason: Change-Id I3ef2e6144371596380351341e58c4ee84d49f39d with SHA-1 ad2421fe5b is in history

Change-Id: I8dbcd16262f35c63a57e9c2d5cc4b055a043e7df
2020-05-27 18:19:01 +00:00
Adam Bookatz
632280b365 Merge "Opening Multiuser doesn't toggle it on" into rvc-dev am: f8fd6156ae am: 43e7fa6d51 am: 9fc127810a am: 39b6aface6
Change-Id: Ia33deb9c34d362838284b3934bb1b5c0cf15f5f5
2020-05-27 18:17:40 +00:00
Adam Bookatz
3d806a3dfb Merge "Opening Multiuser doesn't toggle it on" into rvc-dev am: f8fd6156ae am: 43e7fa6d51 am: 325e71b897 am: 3e45415f0c
Change-Id: I0101f01b7ab94366f59fb5411e64c837262df145
2020-05-27 18:17:10 +00:00
Benedict Wong
537220db1e [automerger skipped] Merge "Hide IKEv2 VPN options if not supported" into rvc-dev am: 5e2f733aee -s ours am: 03bf3af139 -s ours am: a89340bf43 -s ours
am skip reason: Change-Id I3ef2e6144371596380351341e58c4ee84d49f39d with SHA-1 149cd3dd77 is in history

Change-Id: Ib64d3084d0c86ad92ea3438b3750fcb0e4b75f9f
2020-05-27 18:10:14 +00:00
Automerger Merge Worker
0f1d7d33ee Merge "[automerger skipped] Merge "Hide IKEv2 VPN options if not supported" into rvc-dev am: 5e2f733aee am: d7a50cb62f -s ours" into rvc-d1-dev-plus-aosp am: 0a1b12278a -s ours
am skip reason: Change-Id I3ef2e6144371596380351341e58c4ee84d49f39d with SHA-1 149cd3dd77 is in history

Change-Id: I0a2c1688c2d99f25a54214d25b8843424d8bae62
2020-05-27 18:09:29 +00:00
Adam Bookatz
62a3dea883 Merge "Opening Multiuser doesn't toggle it on" into rvc-dev am: f8fd6156ae am: dcd4edc456 am: 0c794f99fd
Change-Id: I5de59ff16db60f367d53142fe658627343d3f08a
2020-05-27 18:08:33 +00:00
Benedict Wong
7242fdf8e4 [automerger skipped] Merge "Hide IKEv2 VPN options if not supported" into rvc-dev am: 5e2f733aee am: d7a50cb62f am: d6cb162baa -s ours
am skip reason: Change-Id I3ef2e6144371596380351341e58c4ee84d49f39d with SHA-1 ad2421fe5b is in history

Change-Id: I63a19b62247af15b4b861c21de91af670a8b350c
2020-05-27 18:06:45 +00:00
Adam Bookatz
39b6aface6 Merge "Opening Multiuser doesn't toggle it on" into rvc-dev am: f8fd6156ae am: 43e7fa6d51 am: 9fc127810a
Change-Id: I1b3660569c1033fc77c6181aab07144c9796f9a8
2020-05-27 18:06:00 +00:00
Adam Bookatz
3e45415f0c Merge "Opening Multiuser doesn't toggle it on" into rvc-dev am: f8fd6156ae am: 43e7fa6d51 am: 325e71b897
Change-Id: Ia27c2491e7cc34f5bd7ea3b45f4c54dffc801921
2020-05-27 18:05:26 +00:00
Benedict Wong
a89340bf43 [automerger skipped] Merge "Hide IKEv2 VPN options if not supported" into rvc-dev am: 5e2f733aee -s ours am: 03bf3af139 -s ours
am skip reason: Change-Id I3ef2e6144371596380351341e58c4ee84d49f39d with SHA-1 149cd3dd77 is in history

Change-Id: I5aa381f256c38f4e944147184ef03112769d37ed
2020-05-27 17:57:56 +00:00
Benedict Wong
d6cb162baa Merge "Hide IKEv2 VPN options if not supported" into rvc-dev am: 5e2f733aee am: d7a50cb62f
Change-Id: Ie6e868708b7f065de64da941ae34d79c91934dfe
2020-05-27 17:56:30 +00:00
Automerger Merge Worker
0a1b12278a Merge "[automerger skipped] Merge "Hide IKEv2 VPN options if not supported" into rvc-dev am: 5e2f733aee am: d7a50cb62f -s ours" into rvc-d1-dev-plus-aosp 2020-05-27 17:56:18 +00:00
Benedict Wong
b4f572cfdc [automerger skipped] Merge "Hide IKEv2 VPN options if not supported" into rvc-dev am: 5e2f733aee am: d7a50cb62f -s ours
am skip reason: Change-Id I3ef2e6144371596380351341e58c4ee84d49f39d with SHA-1 ad2421fe5b is in history

Change-Id: I15aef8f7428d93a9ec82cc681c837dfe9841b94e
2020-05-27 17:56:14 +00:00
Adam Bookatz
0c794f99fd Merge "Opening Multiuser doesn't toggle it on" into rvc-dev am: f8fd6156ae am: dcd4edc456
Change-Id: I3466d9db2cc0003fbdeef134ebe031c61485f76b
2020-05-27 17:55:57 +00:00
Adam Bookatz
9fc127810a Merge "Opening Multiuser doesn't toggle it on" into rvc-dev am: f8fd6156ae am: 43e7fa6d51
Change-Id: I72f7e144a25dd679f138e048e8ec4be685c824d5
2020-05-27 17:55:44 +00:00
Adam Bookatz
325e71b897 Merge "Opening Multiuser doesn't toggle it on" into rvc-dev am: f8fd6156ae am: 43e7fa6d51
Change-Id: Ic289a592535de3d7bd5bcff5b7ab4d01faaabd9b
2020-05-27 17:55:21 +00:00
Benedict Wong
d7a50cb62f Merge "Hide IKEv2 VPN options if not supported" into rvc-dev am: 5e2f733aee
Change-Id: Ifad4d14eb356a70d1a4eb5a543219b9d1eb3b852
2020-05-27 17:33:14 +00:00
Benedict Wong
03bf3af139 [automerger skipped] Merge "Hide IKEv2 VPN options if not supported" into rvc-dev am: 5e2f733aee -s ours
am skip reason: Change-Id I3ef2e6144371596380351341e58c4ee84d49f39d with SHA-1 ad2421fe5b is in history

Change-Id: I2e8c9a6c8c997eeeaf3500da74d5c97b7db73eb0
2020-05-27 17:33:02 +00:00
Adam Bookatz
43e7fa6d51 Merge "Opening Multiuser doesn't toggle it on" into rvc-dev am: f8fd6156ae
Change-Id: I0df967353ef0dd28f75e91d210bd50b0eaf74a14
2020-05-27 17:33:00 +00:00
Adam Bookatz
dcd4edc456 Merge "Opening Multiuser doesn't toggle it on" into rvc-dev am: f8fd6156ae
Change-Id: I33a68598516d6a7e1537e899ef173b6f46114171
2020-05-27 17:32:20 +00:00
Edgar Wang
2ee4df2af5 Remove duplicate search result when search "Bubbles"
Bug: 155846034
Test: manual
Change-Id: I08333a6af9354ef5af3e7f3c20aaeb5c2e2453e2
2020-05-28 01:31:05 +08:00
Benedict Wong
5e2f733aee Merge "Hide IKEv2 VPN options if not supported" into rvc-dev 2020-05-27 17:31:02 +00:00
Adam Bookatz
f8fd6156ae Merge "Opening Multiuser doesn't toggle it on" into rvc-dev 2020-05-27 17:15:33 +00:00
Chen Xu
6faaeb6bfc Merge "AOSP Cellbroadcast renaming" 2020-05-27 16:13:38 +00:00
TreeHugger Robot
80d919c1fc Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659 am: ebef186155 am: 5763102add am: fb022cc32c
Change-Id: Iae17e86761a5d87494944d98d2728f25e8e89d03
2020-05-27 12:38:12 +00:00
Automerger Merge Worker
c0a64db2e2 Merge "Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659 am: e3e2ce74f7 am: e56caf1577" into rvc-qpr-dev-plus-aosp am: b75144e7e5
Change-Id: I158f2233f6aa4bbb291250fdabef1dae39ed65af
2020-05-27 12:37:51 +00:00
TreeHugger Robot
bcf9d9e97f Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659 am: e3e2ce74f7 am: a9df21b508 am: 43a459cb1b
Change-Id: I0ffcb7bfd8fed9aa2f769a144e1c33c330d7c9ff
2020-05-27 12:37:04 +00:00
TreeHugger Robot
fb022cc32c Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659 am: ebef186155 am: 5763102add
Change-Id: I3b236ef65dd5291c1ca562fb73c073fa08ab9ea4
2020-05-27 12:17:46 +00:00
Automerger Merge Worker
b75144e7e5 Merge "Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659 am: e3e2ce74f7 am: e56caf1577" into rvc-qpr-dev-plus-aosp 2020-05-27 12:17:40 +00:00
TreeHugger Robot
5942096e2f Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659 am: e3e2ce74f7 am: e56caf1577
Change-Id: I78038830aba9608d9f6d9bf75eca0a37fcddee41
2020-05-27 12:17:28 +00:00
TreeHugger Robot
43a459cb1b Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659 am: e3e2ce74f7 am: a9df21b508
Change-Id: Ife00386ab5045ed1121707a202308e35b56404ee
2020-05-27 12:17:11 +00:00
TreeHugger Robot
5763102add Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659 am: ebef186155
Change-Id: Ib8cb46616fa412f4ad0d8e4a73858f3f08972f52
2020-05-27 12:06:29 +00:00
TreeHugger Robot
e56caf1577 Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659 am: e3e2ce74f7
Change-Id: Ibbe7b902e7e0a618a607059a33e94f42cbc30df6
2020-05-27 12:05:08 +00:00
TreeHugger Robot
a9df21b508 Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659 am: e3e2ce74f7
Change-Id: I1bd4fa1d60bf9362541c7a2e8227c2f84ca940f1
2020-05-27 12:05:07 +00:00
Stanley Wang
c5bac19d25 Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04 am: f86897477c am: 308b5f0efd am: 7f2598c52a
Change-Id: I0c856b4a964ee92f42a7e39ae3c55fad82954b9f
2020-05-27 11:55:56 +00:00
Automerger Merge Worker
b2bc7f54c3 Merge "Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04 am: a17be1f732 am: c83abc4906" into rvc-qpr-dev-plus-aosp am: 1467812913
Change-Id: I2f13e1c8eba6dbabed05385920f153947a6f9594
2020-05-27 11:55:42 +00:00
TreeHugger Robot
e3e2ce74f7 Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659
Change-Id: Icf1d67fe6a49b14e3bebb19ff4f8c3a3a691b09f
2020-05-27 11:55:38 +00:00
TreeHugger Robot
ebef186155 Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659
Change-Id: Ifef1e319dacc0d12c4ae7d162d221daa0a342597
2020-05-27 11:55:38 +00:00