Chen Xu
76f2b27e3b
Merge "AOSP Cellbroadcast renaming" into rvc-dev am: e7d1c822fc
...
Change-Id: I7e2ba395848723900c4596243bb51f75abf915f5
2020-05-28 02:00:05 +00:00
Chen Xu
f4d1912123
Merge "AOSP Cellbroadcast renaming" into rvc-dev am: e7d1c822fc
...
Change-Id: I25cfd0ef5a3b39c3c9e0d66c08912a7ab82902e1
2020-05-28 02:00:03 +00:00
Chen Xu
e7d1c822fc
Merge "AOSP Cellbroadcast renaming" into rvc-dev
2020-05-28 01:46:10 +00:00
TreeHugger Robot
ebd23bb977
Merge "Some notification history fixes" into rvc-dev am: 69d210c7df am: 256f070ed0 am: 33beacef89 am: 539e7e1fb4 am: f0a239bc56
...
Change-Id: I2526e61bbab357de85fb40bd5a471185c5db4df1
2020-05-27 21:44:48 +00:00
TreeHugger Robot
323375cfec
Merge "Some notification history fixes" into rvc-dev am: 69d210c7df am: 39507de82b am: 5910536ffe am: 644c916bb1 am: 64104e4db1
...
Change-Id: I7b6244816ff5d65cb83213fee85fe823b4f88948
2020-05-27 21:44:25 +00:00
TreeHugger Robot
14abd56dcd
Merge "Some notification history fixes" into rvc-dev am: 69d210c7df am: 39507de82b am: 3e6e83faf9 am: 2fbf0c12a1 am: 4b196e4875
...
Change-Id: I7701ee55a60c33b81d1de95e04af648d1b1d5d3f
2020-05-27 21:44:06 +00:00
TreeHugger Robot
f0a239bc56
Merge "Some notification history fixes" into rvc-dev am: 69d210c7df am: 256f070ed0 am: 33beacef89 am: 539e7e1fb4
...
Change-Id: Icbfebc3a197419c2cfc41f547d1a9c4e89860faa
2020-05-27 21:25:34 +00:00
TreeHugger Robot
64104e4db1
Merge "Some notification history fixes" into rvc-dev am: 69d210c7df am: 39507de82b am: 5910536ffe am: 644c916bb1
...
Change-Id: I89237c1166e44fc15c617c4f4dbc991523eda677
2020-05-27 21:25:18 +00:00
TreeHugger Robot
4b196e4875
Merge "Some notification history fixes" into rvc-dev am: 69d210c7df am: 39507de82b am: 3e6e83faf9 am: 2fbf0c12a1
...
Change-Id: I1362b39bb707a4c1393b899641693d8e7836a068
2020-05-27 21:25:09 +00:00
TreeHugger Robot
539e7e1fb4
Merge "Some notification history fixes" into rvc-dev am: 69d210c7df am: 256f070ed0 am: 33beacef89
...
Change-Id: I20a01ccfe1c7d9cfd8ce0dc1ca44669fb68448d1
2020-05-27 21:09:35 +00:00
TreeHugger Robot
644c916bb1
Merge "Some notification history fixes" into rvc-dev am: 69d210c7df am: 39507de82b am: 5910536ffe
...
Change-Id: Ieb20d22d3d983ef2a0471cb04e88742db298a99d
2020-05-27 21:09:27 +00:00
TreeHugger Robot
2fbf0c12a1
Merge "Some notification history fixes" into rvc-dev am: 69d210c7df am: 39507de82b am: 3e6e83faf9
...
Change-Id: I8312e5776282257c7c2f09e297bcf04da5dca67a
2020-05-27 21:09:15 +00:00
TreeHugger Robot
33beacef89
Merge "Some notification history fixes" into rvc-dev am: 69d210c7df am: 256f070ed0
...
Change-Id: I480c7cc7e8123c6f83573842e1e8970c79aba7f8
2020-05-27 20:53:49 +00:00
TreeHugger Robot
5910536ffe
Merge "Some notification history fixes" into rvc-dev am: 69d210c7df am: 39507de82b
...
Change-Id: Id2097ac899c051e44ebf465cc90dcdee5da1247f
2020-05-27 20:53:41 +00:00
TreeHugger Robot
3e6e83faf9
Merge "Some notification history fixes" into rvc-dev am: 69d210c7df am: 39507de82b
...
Change-Id: Ie27e5abc2b79b89ea77d0308703b5fcbade2a98a
2020-05-27 20:53:26 +00:00
Automerger Merge Worker
ce80bba829
Merge "Merge "Remove duplicate search result when search "Bubbles"" into rvc-dev am: 86b5034215 am: 5aa9c97a51 am: e627780301" into rvc-qpr-dev-plus-aosp am: ea0f51cc91 am: 528c3dee36
...
Change-Id: I783e095a69d2d2226e44905d7068e57fb141e538
2020-05-27 20:42:16 +00:00
TreeHugger Robot
5dea9a6140
Merge "Remove duplicate search result when search "Bubbles"" into rvc-dev am: 86b5034215 am: 5aa9c97a51 am: 473067cccd am: 0389ba88de am: 7d9810e7e8
...
Change-Id: I367a7e5e3f3e2708765df4c880566b6e5dad4d58
2020-05-27 20:42:10 +00:00
TreeHugger Robot
2fcad51a89
Merge "Remove duplicate search result when search "Bubbles"" into rvc-dev am: 86b5034215 am: db857cb4f3 am: 204407ac5f am: e61ea3a7a0 am: 8dec5e1cd9
...
Change-Id: I903d6ab2621250dbd614c0c19f160b02bb17f8d8
2020-05-27 20:41:52 +00:00
TreeHugger Robot
256f070ed0
Merge "Some notification history fixes" into rvc-dev am: 69d210c7df
...
Change-Id: I7b7eecab337ba84983d37d4a909f5cc1b89c9dad
2020-05-27 20:35:55 +00:00
TreeHugger Robot
39507de82b
Merge "Some notification history fixes" into rvc-dev am: 69d210c7df
...
Change-Id: I122252be30db11ea6030d5d23c353d36b617b059
2020-05-27 20:35:46 +00:00
Automerger Merge Worker
528c3dee36
Merge "Merge "Remove duplicate search result when search "Bubbles"" into rvc-dev am: 86b5034215 am: 5aa9c97a51 am: e627780301" into rvc-qpr-dev-plus-aosp am: ea0f51cc91
...
Change-Id: I568a7b4ef5232f02beacbe88a744a591663c46b6
2020-05-27 20:31:42 +00:00
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
Chen Xu
c2ee364f6f
AOSP Cellbroadcast renaming
...
As part of mainline effort, AOSP cellbroadcast package name was changed
from com.android.cellbroadcast to com.android.cellbroadcast.module
Bug: 155844209
Test: Manual test
Change-Id: Ic38372d96918c17d3cd61832ff668fcfc61f0686
Merged-in: Ic38372d96918c17d3cd61832ff668fcfc61f0686
2020-05-27 20:25:43 +00:00
TreeHugger Robot
69d210c7df
Merge "Some notification history fixes" into rvc-dev
2020-05-27 20:25:36 +00:00
Automerger Merge Worker
ea0f51cc91
Merge "Merge "Remove duplicate search result when search "Bubbles"" into rvc-dev am: 86b5034215 am: 5aa9c97a51 am: e627780301" into rvc-qpr-dev-plus-aosp
2020-05-27 20:08:21 +00:00
TreeHugger Robot
3c7644b0c4
Merge "Remove duplicate search result when search "Bubbles"" into rvc-dev am: 86b5034215 am: 5aa9c97a51 am: e627780301
...
Change-Id: Idde5db8f6c18fb8be6cbffc4132317139909f05e
2020-05-27 20:08:10 +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
e627780301
Merge "Remove duplicate search result when search "Bubbles"" into rvc-dev am: 86b5034215 am: 5aa9c97a51
...
Change-Id: Id445a10fc9a77b0cdf46289e7fbbf438a6497ad1
2020-05-27 19:56:08 +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
103572ed26
[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: 0f3e7a5512 -s ours
...
am skip reason: Change-Id I3ef2e6144371596380351341e58c4ee84d49f39d with SHA-1 149cd3dd77
2020-05-27 18:41:08 +00:00
Automerger Merge Worker
d19d689270
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: 68b1877994 -s ours
...
am skip reason: Change-Id I3ef2e6144371596380351341e58c4ee84d49f39d with SHA-1 149cd3dd77
2020-05-27 18:41:02 +00:00
Adam Bookatz
287189fca6
Merge "Opening Multiuser doesn't toggle it on" into rvc-dev am: f8fd6156ae am: dcd4edc456 am: 0c794f99fd am: 62a3dea883 am: 58f359648e
...
Change-Id: I813e1de04f303bcf1b58b9d3dbb76cf5c0927240
2020-05-27 18:40:11 +00:00
Benedict Wong
029892c102
[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: 66adfe2c57 -s ours
...
am skip reason: Change-Id I3ef2e6144371596380351341e58c4ee84d49f39d with SHA-1 ad2421fe5b
2020-05-27 18:38:53 +00:00
Adam Bookatz
6475641823
Merge "Opening Multiuser doesn't toggle it on" into rvc-dev am: f8fd6156ae am: 43e7fa6d51 am: 9fc127810a am: 39b6aface6 am: 632280b365
...
Change-Id: Ia99e39715d492f796755018442075be07b6ce05b
2020-05-27 18:38:27 +00:00
Adam Bookatz
8c7cae3839
Merge "Opening Multiuser doesn't toggle it on" into rvc-dev am: f8fd6156ae am: 43e7fa6d51 am: 325e71b897 am: 3e45415f0c am: 3d806a3dfb
...
Change-Id: I552c7eb272393d32f3c06c1fc6fb2bd6f63080d5
2020-05-27 18:37:32 +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
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
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
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
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
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
