Commit Graph

65134 Commits

Author SHA1 Message Date
TreeHugger Robot
8ed1704c49 Merge "Add information video placeholder and ref" into rvc-dev am: 4cc81daec0 am: 8c497918fa am: 4423519f38 am: 322cb816c5
Change-Id: I49f4d304395e65622f96f1dd342cde317ea9ba87
2020-04-24 15:35:39 +00:00
TreeHugger Robot
d047e0c758 Merge "Add information video placeholder and ref" into rvc-dev am: 4cc81daec0 am: 8c68403b23 am: f65b434b82
Change-Id: I7f19000b4565b07ba7b45a3bf9a1de5d73a1fd08
2020-04-24 15:23:31 +00:00
TreeHugger Robot
322cb816c5 Merge "Add information video placeholder and ref" into rvc-dev am: 4cc81daec0 am: 8c497918fa am: 4423519f38
Change-Id: I028be16b28dd7dc50390bc8ee6e77ec33dddd6ef
2020-04-24 15:23:21 +00:00
TreeHugger Robot
5c63a810c3 Merge "Add information video placeholder and ref" into rvc-dev am: 4cc81daec0 am: 8c497918fa am: effdb21d40
Change-Id: Idf5b45fb1c3cdd9083e58a32ff3d2bdf8002c8c6
2020-04-24 15:23:18 +00:00
TreeHugger Robot
f65b434b82 Merge "Add information video placeholder and ref" into rvc-dev am: 4cc81daec0 am: 8c68403b23
Change-Id: Ibf8dd7cdd9d16ef13bcfd602c05f4e62707a8aee
2020-04-24 15:06:25 +00:00
TreeHugger Robot
4423519f38 Merge "Add information video placeholder and ref" into rvc-dev am: 4cc81daec0 am: 8c497918fa
Change-Id: Ic4f95f7cbe6688c16f5c467580895d2b72bf3973
2020-04-24 15:00:32 +00:00
TreeHugger Robot
effdb21d40 Merge "Add information video placeholder and ref" into rvc-dev am: 4cc81daec0 am: 8c497918fa
Change-Id: Id1b3a1925b25c83f668019c21515a6ebe513d20e
2020-04-24 15:00:15 +00:00
TreeHugger Robot
8c68403b23 Merge "Add information video placeholder and ref" into rvc-dev am: 4cc81daec0
Change-Id: I5d873c8dc83da4c0516b18833dc6511e1c2fc623
2020-04-24 14:55:06 +00:00
TreeHugger Robot
8c497918fa Merge "Add information video placeholder and ref" into rvc-dev am: 4cc81daec0
Change-Id: If0714df51c08d5d84431885acad2157dcd5ba557
2020-04-24 14:54:58 +00:00
TreeHugger Robot
4cc81daec0 Merge "Add information video placeholder and ref" into rvc-dev 2020-04-24 14:41:12 +00:00
TreeHugger Robot
23ad82ecb2 Merge "Fix some heights" into rvc-dev am: da9e2099de am: e5d2689ada am: ec988a1003 am: de3ef49ee7
Change-Id: I6db88b34802c1bbf2cf5298bd1126b8fa21a1f33
2020-04-24 14:02:39 +00:00
TreeHugger Robot
c37b11451e Merge "Fix some heights" into rvc-dev am: da9e2099de am: d3b025ae8a am: 564ccd762c
Change-Id: I7423266af3b607ff338f304bd642cab2fb970321
2020-04-24 13:47:15 +00:00
TreeHugger Robot
768596ab0f Merge "Fix some heights" into rvc-dev am: da9e2099de am: e5d2689ada am: b3a96a0577
Change-Id: Ia25a7b5c20c59f30462edbed72677dd3030815b6
2020-04-24 13:46:49 +00:00
TreeHugger Robot
de3ef49ee7 Merge "Fix some heights" into rvc-dev am: da9e2099de am: e5d2689ada am: ec988a1003
Change-Id: Iee9a93cd70af6a89d452515e0ec8526a60bb3e20
2020-04-24 13:46:37 +00:00
TreeHugger Robot
ec988a1003 Merge "Fix some heights" into rvc-dev am: da9e2099de am: e5d2689ada
Change-Id: Ib913235f139b78d17504d9b072116bebdbe48004
2020-04-24 13:34:55 +00:00
TreeHugger Robot
564ccd762c Merge "Fix some heights" into rvc-dev am: da9e2099de am: d3b025ae8a
Change-Id: Ie3dac1d1ad547046861d1dd943d66b066365585f
2020-04-24 13:34:41 +00:00
TreeHugger Robot
b3a96a0577 Merge "Fix some heights" into rvc-dev am: da9e2099de am: e5d2689ada
Change-Id: I9bec389ef29908f47d3c347278c3d87855b3818e
2020-04-24 13:34:25 +00:00
TreeHugger Robot
d3b025ae8a Merge "Fix some heights" into rvc-dev am: da9e2099de
Change-Id: I5ba475a368958862ba33a767eb465a370bae19a3
2020-04-24 13:24:52 +00:00
TreeHugger Robot
e5d2689ada Merge "Fix some heights" into rvc-dev am: da9e2099de
Change-Id: I399533fd390b5365034a26cf6a7b9c9c3065241f
2020-04-24 13:24:41 +00:00
TreeHugger Robot
da9e2099de Merge "Fix some heights" into rvc-dev 2020-04-24 13:09:47 +00:00
Robert Luo
0260c4f0ed Merge "Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems" into rvc-dev am: 44121a7a3d am: 44cc3810f3 am: be91b9dcd4 am: be30819836
Change-Id: Ib6bf48730584d23e77272dabb0a5c8e0889ca175
2020-04-24 12:13:13 +00:00
Robert Luo
0622c9a6fd Merge "Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems" into rvc-dev am: 44121a7a3d am: 5a5c7266c8 am: 5a05ab2ef7
Change-Id: Ib05a940fab7476539625a35363e98cf5bdd7d789
2020-04-24 12:03:57 +00:00
Robert Luo
36cb9117b1 Merge "Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems" into rvc-dev am: 44121a7a3d am: 44cc3810f3 am: e2a37cf952
Change-Id: I23f7fd6ca61ee1c72fd0db6ab8face671707b03e
2020-04-24 12:03:40 +00:00
Robert Luo
be30819836 Merge "Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems" into rvc-dev am: 44121a7a3d am: 44cc3810f3 am: be91b9dcd4
Change-Id: I3b7e07ddd2b98b0a8753148d32f25fac7e0a418c
2020-04-24 12:03:35 +00:00
Robert Luo
be91b9dcd4 Merge "Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems" into rvc-dev am: 44121a7a3d am: 44cc3810f3
Change-Id: If406c84060aa339ccb86e919aa7f2c3048cb3f31
2020-04-24 11:51:32 +00:00
Robert Luo
5a05ab2ef7 Merge "Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems" into rvc-dev am: 44121a7a3d am: 5a5c7266c8
Change-Id: I8eb9f68743d541a0ed17f7f7c5bae1e4d8489950
2020-04-24 11:51:32 +00:00
Robert Luo
e2a37cf952 Merge "Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems" into rvc-dev am: 44121a7a3d am: 44cc3810f3
Change-Id: Ia0b0c5bfc6d18d09f22f3bdae288287ea4b4285a
2020-04-24 11:51:19 +00:00
Robert Luo
5a5c7266c8 Merge "Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems" into rvc-dev am: 44121a7a3d
Change-Id: I1a26e35e643e1307b37f543fd80f238e94654b79
2020-04-24 11:41:37 +00:00
Robert Luo
44cc3810f3 Merge "Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems" into rvc-dev am: 44121a7a3d
Change-Id: Ifea3839c7b30aee374cae85adcb78ce5558d0e65
2020-04-24 11:41:23 +00:00
Robert Luo
44121a7a3d Merge "Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems" into rvc-dev 2020-04-24 11:24:30 +00:00
Robert Luo
b26b9561a1 Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems
Bug: 154561690
Test: make RunSettingsRoboTests and pass all test cases in NfcAndPaymentFragmentTest
Change-Id: I12f4901e4de01eb259f9daf3ac33b1e1879e98fd
2020-04-24 17:47:12 +08:00
TreeHugger Robot
c4ed2557b7 Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf am: 204c1bc8f5 am: 5f5e3898f5 am: 0065eb6558
Change-Id: I7a3c2282aca721ef63a13f39010483895c49483f
2020-04-24 09:30:36 +00:00
Automerger Merge Worker
aba7be6d6f Merge "Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf am: beacdf9774" into rvc-d1-dev-plus-aosp am: 1012257cdc
Change-Id: Id5e64719ad5f2078b4b0a1818b6c7d8c99289478
2020-04-24 09:08:45 +00:00
TreeHugger Robot
12d2465c80 Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf am: 204c1bc8f5 am: 46917ef154
Change-Id: I4f28b4ce69bbc72c86b7657459f1fcfa158898f1
2020-04-24 09:08:23 +00:00
TreeHugger Robot
0065eb6558 Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf am: 204c1bc8f5 am: 5f5e3898f5
Change-Id: Ie9233357f644a60d0e3cdc7f86ca7e37c64d77ce
2020-04-24 09:08:08 +00:00
Automerger Merge Worker
1012257cdc Merge "Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf am: beacdf9774" into rvc-d1-dev-plus-aosp 2020-04-24 08:57:02 +00:00
TreeHugger Robot
f306df38f2 Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf am: beacdf9774
Change-Id: Ic2f98d74f765f3d9f261be5a555bef218419b4ff
2020-04-24 08:56:57 +00:00
TreeHugger Robot
5f5e3898f5 Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf am: 204c1bc8f5
Change-Id: I9d5c961c685ca498e70fb4033076e192abc3c680
2020-04-24 08:56:55 +00:00
TreeHugger Robot
46917ef154 Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf am: 204c1bc8f5
Change-Id: I18fd9c5bcfd70db343fb9ecd0eefda724f47c3b7
2020-04-24 08:56:46 +00:00
TreeHugger Robot
beacdf9774 Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf
Change-Id: Idb79edf5ef01ab33bcbd6625279f2eb21cd44c68
2020-04-24 08:40:06 +00:00
TreeHugger Robot
204c1bc8f5 Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf
Change-Id: I061f46e5d5c3f42d8265ad490858398469f0a6b6
2020-04-24 08:40:02 +00:00
TreeHugger Robot
0a98937baf Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev 2020-04-24 08:32:55 +00:00
TreeHugger Robot
403babc3b9 Merge "Cast device missing from output switcher list" into rvc-dev am: c38c02eec8 am: e313fb3f87 am: 0ce5645700 am: 034454f0be
Change-Id: I8bd39d27e95ec1be9221805ddf1428eb57b27705
2020-04-24 07:26:31 +00:00
TreeHugger Robot
7c5a8ae7bb Merge "[Wi-Fi] Add new unit test file WifiP2pSettingsTest.java." into rvc-dev am: a4590dc227 am: 1bb16670c6 am: 0a67f2b416 am: 0bbf81119a
Change-Id: I4ee019e2e436a2bc6e64d8c2011cb0f6918803b7
2020-04-24 07:26:22 +00:00
TreeHugger Robot
4ca7241fd0 Merge "Cast device missing from output switcher list" into rvc-dev am: c38c02eec8 am: 6a61af8835 am: 7732407cd2
Change-Id: I9cb528b4e16c0716a1f029a43c7db430c833ac71
2020-04-24 07:10:31 +00:00
Automerger Merge Worker
3eee8dc74e Merge "Merge "[Wi-Fi] Add new unit test file WifiP2pSettingsTest.java." into rvc-dev am: a4590dc227 am: ab43d59d5d" into rvc-d1-dev-plus-aosp am: b0251be0e2
Change-Id: Ie83a4024dc8b79dd5022068be185b4f8de0085fc
2020-04-24 07:10:23 +00:00
TreeHugger Robot
034454f0be Merge "Cast device missing from output switcher list" into rvc-dev am: c38c02eec8 am: e313fb3f87 am: 0ce5645700
Change-Id: I6476e50c4cf4479ab631034a4a737eadeafbdb29
2020-04-24 07:10:15 +00:00
TreeHugger Robot
54b6584ff4 Merge "Cast device missing from output switcher list" into rvc-dev am: c38c02eec8 am: e313fb3f87 am: c5f2e1defb
Change-Id: I60634cfa1edfd14a211a129fbe4a6cf0bd1b6242
2020-04-24 07:10:15 +00:00
TreeHugger Robot
0bbf81119a Merge "[Wi-Fi] Add new unit test file WifiP2pSettingsTest.java." into rvc-dev am: a4590dc227 am: 1bb16670c6 am: 0a67f2b416
Change-Id: I98e2d703bbd30c1b55678abdfedfeb5fc37c9fae
2020-04-24 07:10:06 +00:00
TreeHugger Robot
da8749304f Merge "[Wi-Fi] Add new unit test file WifiP2pSettingsTest.java." into rvc-dev am: a4590dc227 am: 1bb16670c6 am: 1292188a56
Change-Id: I8ed66f17d2bc1dbfcfb0199ff36a41789320136f
2020-04-24 07:10:05 +00:00