61943 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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	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	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 is in history Change-Id: Idc759300e365de090d27e82aababed0725831758	2020-03-24 10:04:29 +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 is in history Change-Id: I225ac40b48c65512c7ec594c80fa391599a728dd	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 is in history Change-Id: I5b266f4a55981afc9f1ebf2da326e6edcea4a783	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	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	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	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
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
Bonian Chen	3ffc55f1ce	Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 am: d2f98e4dad ... Change-Id: Ibf4c8ae584bcd77145df0837a0301e811b95cfe4	2020-03-24 07:38:03 +00:00
Bonian Chen	f9f9cee93e	Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 am: d2f98e4dad ... Change-Id: I77e9cf330a27c5aaa62d0c7d1d5140cc89323490	2020-03-24 07:37:58 +00:00
Bonian Chen	aec1582388	Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 am: 0a5211a6d5 ... Change-Id: I8942fd2fbced1b249cb9efcf9013f00e7e16b976	2020-03-24 07:37:49 +00:00
Arc Wang	e4b0989766	Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev ... * changes: [Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - II [Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - I	2020-03-24 07:25:17 +00:00
Bonian Chen	0a5211a6d5	Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 ... Change-Id: I42831f5540acd25bc6129ca14ad42b1717cf9e98	2020-03-24 07:15:24 +00:00
Bonian Chen	d2f98e4dad	Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 ... Change-Id: Iac958c3fa1bab2de8ea55fe4194590b3275180d5	2020-03-24 07:15:13 +00:00
Bonian Chen	9a0f633600	Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev	2020-03-24 07:03:52 +00:00
TreeHugger Robot	ba7863dc17	Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: c21f849fe7 am: 0e2eab994d am: 4a0e23b6b0 ... Change-Id: I26151b4fab716a3ebea89c23762cfae17c8e9cc3	2020-03-24 06:52:51 +00:00
Automerger Merge Worker	c18184aee9	Merge "Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: 437b0b66d4" into rvc-d1-dev-plus-aosp am: 45f1e0230a ... Change-Id: Ifc5a7688f035ef1f86184bc07653162bdbfca1c2	2020-03-24 06:39:36 +00:00
TreeHugger Robot	4a0e23b6b0	Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: c21f849fe7 am: 0e2eab994d ... Change-Id: I731f652a3512f951b9553d2b35484ca71e55e624	2020-03-24 06:39:09 +00:00
TreeHugger Robot	95d85c0e34	Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: c21f849fe7 am: f5eac3f0cf ... Change-Id: I7db30868c2560775df97b9c8e4850e58b31ab669	2020-03-24 06:39:06 +00:00
Automerger Merge Worker	45f1e0230a	Merge "Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: 437b0b66d4" into rvc-d1-dev-plus-aosp	2020-03-24 06:31:31 +00:00
TreeHugger Robot	0e2eab994d	Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: c21f849fe7 ... Change-Id: I8b7b73e65f18c955bd82f38390ec88b5520e62ab	2020-03-24 06:31:23 +00:00
TreeHugger Robot	f5eac3f0cf	Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: c21f849fe7 ... Change-Id: I2795824b08a4c7943ebb8e19ecbb2cd8cc3cdfa8	2020-03-24 06:31:21 +00:00
TreeHugger Robot	c09d278177	Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: 437b0b66d4 ... Change-Id: If46d413f025717fd9775ade524f191b5712d3967	2020-03-24 06:31:15 +00:00
Treehugger Robot	2b8bde162f	Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0 ... Bug: 150258187 Change-Id: I6b363bd609d580d547cb59851f5bfaba57ef7154 (cherry picked from commit 7c62cbd97e) Merged-In: I6b363bd609d580d547cb59851f5bfaba57ef7154	2020-03-24 06:21:25 +00:00
TreeHugger Robot	437b0b66d4	Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 ... Change-Id: I15d091a2b9354b2f6039abc5d7f8d26befde577a	2020-03-24 06:09:06 +00:00
TreeHugger Robot	c21f849fe7	Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 ... Change-Id: Ie488350d8a6ca7016bbaf7ace6bd7aed70568d49	2020-03-24 06:08:49 +00:00