TreeHugger Robot
168fe82aa5
Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01
...
Change-Id: Ie80135ad3fe7078fee32de117e2c543e7c3de83a
2020-03-24 12:36:43 +00:00
TreeHugger Robot
875b0df3dd
Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01
...
Change-Id: Ie3f31d838d91cf051524e81f1cac87dec0d84add
2020-03-24 12:35:56 +00:00
TreeHugger Robot
87c0179c01
Merge "Re-enable ignored tests" into rvc-dev
2020-03-24 12:22:11 +00:00
Ben Murdoch
e00acfa56b
Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 7b2154d996 am: ffc010f55e am: 3e74710b10 am: 39796aae1c
...
Change-Id: I2f0d4183e5285331b8d5e377a4c8769e49911793
2020-03-24 11:30:00 +00:00
Automerger Merge Worker
9208aae194
Merge "Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 7b2154d996" into rvc-d1-dev-plus-aosp am: 1c4765f6ee am: ae81e35a61
...
Change-Id: I02920293d0ff89d62557c5391ab3fe935d7b6f1f
2020-03-24 11:29:00 +00:00
Ben Murdoch
39796aae1c
Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 7b2154d996 am: ffc010f55e am: 3e74710b10
...
Change-Id: I838336311d33fde17627f09c7a6a4c1a2774314f
2020-03-24 11:28:47 +00:00
Ben Murdoch
16398e5564
Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 63aded6f67 am: cdcf827947 am: 7c7b42d06d
...
Change-Id: I03fb1a0f60fac8c8ce9260331894b947bf0cd371
2020-03-24 11:28:22 +00:00
Automerger Merge Worker
ae81e35a61
Merge "Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 7b2154d996" into rvc-d1-dev-plus-aosp am: 1c4765f6ee
...
Change-Id: I74076b7d10f45a3ca56b39c2e76a210a96b7f62a
2020-03-24 11:13:41 +00:00
Ben Murdoch
7c7b42d06d
Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 63aded6f67 am: cdcf827947
...
Change-Id: I5e74700e6ce21ffc21ee1b13200c5741bf476de7
2020-03-24 11:13:08 +00:00
Ben Murdoch
3e74710b10
Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 7b2154d996 am: ffc010f55e
...
Change-Id: I0665a3cdc28361591859a73748361002fa45d0b5
2020-03-24 11:13:03 +00:00
Automerger Merge Worker
1c4765f6ee
Merge "Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 7b2154d996" into rvc-d1-dev-plus-aosp
2020-03-24 10:57:38 +00:00
Ben Murdoch
55ee7603e5
Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 7b2154d996
...
Change-Id: I199ea1ad09f5aaef63ffc9312d058a5c452e53d5
2020-03-24 10:57:28 +00:00
Ben Murdoch
ffc010f55e
Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 7b2154d996
...
Change-Id: I08d7d6d5d17356c1903a814c68e572a7851657e0
2020-03-24 10:57:24 +00:00
Ben Murdoch
cdcf827947
Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 63aded6f67
...
Change-Id: I6fec6b405557e9ad69ff875e890591be9a6d8d02
2020-03-24 10:57:24 +00:00
Ben Murdoch
7b2154d996
Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599
...
Change-Id: I4a67e3a9d94d63f0cc9cb6942acabd1e9c32b936
2020-03-24 10:45:49 +00:00
Ben Murdoch
63aded6f67
Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599
...
Change-Id: I822c63ede7d0f92dbfe724731350fc140db88ef5
2020-03-24 10:45:25 +00:00
Ben Murdoch
7afced3599
Merge "Move strings related to user creation to SettingsLib." into rvc-dev
2020-03-24 10:25:21 +00:00
Zoey Chen
14ee313530
[automerger skipped] Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: 2a0dd6f700 am: 12952db603 am: 775ae6b0fd -s ours am: c961f3d239 -s ours
...
am skip reason: Change-Id I6b363bd609d580d547cb59851f5bfaba57ef7154 with SHA-1 2b8bde162f
2020-03-24 10:13:38 +00:00
Zoey Chen
c961f3d239
[automerger skipped] Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: 2a0dd6f700 am: 12952db603 am: 775ae6b0fd -s ours
...
am skip reason: Change-Id I6b363bd609d580d547cb59851f5bfaba57ef7154 with SHA-1 2b8bde162f
2020-03-24 10:04:29 +00:00
Zoey Chen
04c8b297c7
[automerger skipped] Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: c1f1682fbf -s ours am: 03e57ffd43 -s ours am: 7e6f34a300 -s ours
...
am skip reason: Change-Id I6b363bd609d580d547cb59851f5bfaba57ef7154 with SHA-1 2b8bde162f
2020-03-24 10:04:22 +00:00
Zoey Chen
4af48a3a16
[automerger skipped] Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: 2a0dd6f700 am: c79289a585 am: fbf27aaf20 -s ours
...
am skip reason: Change-Id I6b363bd609d580d547cb59851f5bfaba57ef7154 with SHA-1 7c62cbd97e
2020-03-24 10:04:15 +00:00
Zoey Chen
7e6f34a300
[automerger skipped] Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: c1f1682fbf -s ours am: 03e57ffd43 -s ours
...
am skip reason: Change-Id I6b363bd609d580d547cb59851f5bfaba57ef7154 with SHA-1 2b8bde162f
2020-03-24 09:56:18 +00:00
Zoey Chen
775ae6b0fd
Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: 2a0dd6f700 am: 12952db603
...
Change-Id: Ia58afd40f773cb257267263639c1911d4e1fd086
2020-03-24 09:55:50 +00:00
Zoey Chen
fbf27aaf20
Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: 2a0dd6f700 am: c79289a585
...
Change-Id: I7cc552df9ddd490fc2c3a99dd3b925fa6ccca3cf
2020-03-24 09:55:50 +00:00
Zoey Chen
03e57ffd43
[automerger skipped] Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: c1f1682fbf -s ours
...
am skip reason: Change-Id I6b363bd609d580d547cb59851f5bfaba57ef7154 with SHA-1 2b8bde162f
2020-03-24 09:33:33 +00:00
Zoey Chen
12952db603
Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: 2a0dd6f700
...
Change-Id: I3a69d760a434d24130fad2abf4a5150a31087970
2020-03-24 09:33:31 +00:00
Zoey Chen
c79289a585
Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: 2a0dd6f700
...
Change-Id: I26dda4b26362bb94c48e1ad439af536d0353df16
2020-03-24 09:33:08 +00:00
Zoey Chen
c1f1682fbf
Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9
...
Change-Id: I2cf40657d94d445a3582f7b64f6e02dbf8e77aa2
2020-03-24 09:16:42 +00:00
Zoey Chen
2a0dd6f700
Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9
...
Change-Id: I75a262c21d215f8669c81056b581c5ffd734accb
2020-03-24 09:16:28 +00:00
Zoey Chen
61b66a28d9
Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev
2020-03-24 09:05:00 +00:00
Arc Wang
5e65a6b786
Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 am: f47f38c9a2 am: 6799768b24 am: 30966bffbc am: 3d40321d82
...
Change-Id: I52473bdd5a475f73a0f3eb54a90d1c49c3b7b709
2020-03-24 08:50:58 +00:00
Arc Wang
3d40321d82
Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 am: f47f38c9a2 am: 6799768b24 am: 30966bffbc
...
Change-Id: I79d74a0a2ce91b6189950333c85e0c7b631b46c0
2020-03-24 08:33:31 +00:00
Automerger Merge Worker
2503511ae8
Merge "Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 am: f47f38c9a2" into rvc-d1-dev-plus-aosp am: 5616f7632b am: 4a96bbb66d
...
Change-Id: I819663835fcad40a924bf4ad5377374394474568
2020-03-24 08:29:24 +00:00
Arc Wang
766e874428
Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 am: e446e42d63 am: 660cacfa0d am: 787f8a7635
...
Change-Id: I394d039cd49428709ce3405d4461bc4c71c7b3b5
2020-03-24 08:28:45 +00:00
Automerger Merge Worker
4a96bbb66d
Merge "Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 am: f47f38c9a2" into rvc-d1-dev-plus-aosp am: 5616f7632b
...
Change-Id: I18c1dc2cc832a6fb136f112798a5af9a1ee50efd
2020-03-24 08:23:17 +00:00
Arc Wang
787f8a7635
Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 am: e446e42d63 am: 660cacfa0d
...
Change-Id: I4bf9933e035fb7070df57e88a8f41fe1f71c4029
2020-03-24 08:22:53 +00:00
Arc Wang
30966bffbc
Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 am: f47f38c9a2 am: 6799768b24
...
Change-Id: I4fff878cb2ed4085dcca5e886772f17935ba57da
2020-03-24 08:22:47 +00:00
Bonian Chen
6106fa1c13
Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 am: d2f98e4dad am: 3ffc55f1ce am: 114c70c9dc am: de5f392bb6
...
Change-Id: I11c4017df3379b6f49779afbbb5dd18a91b422a7
2020-03-24 08:13:39 +00:00
Bonian Chen
de5f392bb6
Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 am: d2f98e4dad am: 3ffc55f1ce am: 114c70c9dc
...
Change-Id: I5365018b659ad6d7d981d085768f622c95fe6c4b
2020-03-24 08:13:24 +00:00
Bonian Chen
cc350611eb
Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 am: d2f98e4dad am: f9f9cee93e am: 125c517409
...
Change-Id: If7ffe688d278d030e6eab4c8cdf7184adec5c146
2020-03-24 08:13:18 +00:00
Bonian Chen
77f2788f82
Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 am: 0a5211a6d5 am: aec1582388 am: 2a25cd5c22
...
Change-Id: I3bd85778b588901160779683cb19b5c34c970d21
2020-03-24 08:12:52 +00:00
Automerger Merge Worker
5616f7632b
Merge "Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 am: f47f38c9a2" into rvc-d1-dev-plus-aosp
2020-03-24 08:08:32 +00:00
Arc Wang
b09f4e3d15
Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 am: f47f38c9a2
...
Change-Id: I8589a73f1896b121ef5800159af5077e907bfa79
2020-03-24 08:08:28 +00:00
Arc Wang
660cacfa0d
Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 am: e446e42d63
...
Change-Id: I9382e4559375d0d77ad206e22e11e3803d829891
2020-03-24 08:08:26 +00:00
Arc Wang
6799768b24
Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 am: f47f38c9a2
...
Change-Id: I4a03387c230ee69638088f1158391ad16aea4881
2020-03-24 08:08:21 +00:00
Bonian Chen
125c517409
Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 am: d2f98e4dad am: f9f9cee93e
...
Change-Id: I8d001f725aaf8066505b6ffe2b645f038a9d0d5e
2020-03-24 07:59:17 +00:00
Bonian Chen
2a25cd5c22
Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 am: 0a5211a6d5 am: aec1582388
...
Change-Id: I02b49faa57a8faf8dcf251a6c170a0cb926613d4
2020-03-24 07:58:55 +00:00
Bonian Chen
114c70c9dc
Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 am: d2f98e4dad am: 3ffc55f1ce
...
Change-Id: Ieca365bb9558a7ff9f42304237313c2afbc7b0d6
2020-03-24 07:58:38 +00:00
Arc Wang
f47f38c9a2
Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766
...
Change-Id: If075945a85a830f214b2d8a33bdba165593f0705
2020-03-24 07:46:28 +00:00
Arc Wang
e446e42d63
Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766
...
Change-Id: Ic73404a2c3392f1049786b5601a72316086eb900
2020-03-24 07:46:26 +00:00
