Brad Ebinger
60204898ec
Fixes ContactDiscoveryDialogFragmentTest
...
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Fixes: 150908269
Change-Id: I06df2928116b33fec39aade733401d60e6cde1c1
2020-03-06 20:54:00 +00:00
Automerger Merge Worker
83585126ce
Merge "Log errors on history load" into rvc-dev am: d27d2b375e am: 045a1c53b0
...
Change-Id: Ia9f32c919e7bdf5f9e033d1d217135f9b70e7d6a
2020-03-06 20:52:03 +00:00
Automerger Merge Worker
acc4e72472
Merge "Log errors on history load" into rvc-dev am: d27d2b375e am: f77db13ff8
...
Change-Id: I2c921a91564d672b6705668251486ff0b700e198
2020-03-06 20:51:53 +00:00
Automerger Merge Worker
caa1efc234
Merge "Log errors on history load" into rvc-dev am: d27d2b375e am: f77db13ff8
...
Change-Id: Ib9cb1bd80156aa0e06888849c0f382d9b795b637
2020-03-06 20:51:50 +00:00
Automerger Merge Worker
f77db13ff8
Merge "Log errors on history load" into rvc-dev am: d27d2b375e
...
Change-Id: I760be35c988a41b54c1ad2fd5444f46389b3dedc
2020-03-06 20:35:26 +00:00
Automerger Merge Worker
045a1c53b0
Merge "Log errors on history load" into rvc-dev am: d27d2b375e
...
Change-Id: I6d67f30948567491a777c505b18084e383d4fa4b
2020-03-06 20:35:26 +00:00
Julia Reynolds
d27d2b375e
Merge "Log errors on history load" into rvc-dev
2020-03-06 20:23:02 +00:00
Automerger Merge Worker
edec363078
[automerger skipped] Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb -s ours am: eae534cda7 am: 51692e38d2 am: 777ac0e39a am: 74b4b59323 am: 6a908db4ea -s ours
...
am skip reason: subject contains skip directive
Change-Id: Icdfbe1fd75ae8acf1059325bddb9171d0504afc3
2020-03-06 17:38:31 +00:00
Automerger Merge Worker
0fe904bc65
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279 am: 86ce68877f -s ours am: 9a4bdcaca6 -s ours am: deffa903e5 -s ours am: a9d8cc3de6 -s ours am: 445e51dd7e -s ours am: 644a482eda -s ours
...
am skip reason: subject contains skip directive
Change-Id: Iebc5d85bd7b67069e6a4d4bef368ebb8c82d5567
2020-03-06 17:38:10 +00:00
Automerger Merge Worker
6a908db4ea
[automerger skipped] Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb -s ours am: eae534cda7 am: 51692e38d2 am: 777ac0e39a am: 74b4b59323
...
Change-Id: I763a164ab459cb41e0085857e23193d5224502cb
2020-03-06 17:36:36 +00:00
Automerger Merge Worker
644a482eda
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279 am: 86ce68877f -s ours am: 9a4bdcaca6 -s ours am: deffa903e5 -s ours am: a9d8cc3de6 -s ours am: 445e51dd7e -s ours
...
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 4a89abe279
2020-03-06 17:35:53 +00:00
Automerger Merge Worker
b40629ff95
[automerger skipped] Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb -s ours am: eae534cda7 am: b2d8e01b7a am: c397839b8b am: 7565cd479d -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ibdbc5918b8437737799b8ad0ce89cbd0830d3d3b
2020-03-06 17:33:01 +00:00
Automerger Merge Worker
ffb511ac25
[automerger skipped] Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb -s ours am: eae534cda7 am: 51692e38d2 am: 8bb9dcabc5 am: 04174a9391 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I37d679c132c89516d7e6481d38ab8e4aa2a8a5f7
2020-03-06 17:32:53 +00:00
Automerger Merge Worker
2271653327
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279 am: 86ce68877f -s ours am: 9a4bdcaca6 -s ours am: b329c29a04 -s ours am: 4876ded481 -s ours am: 31e052bf08 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Iea275eb9c3e085a433c592580a16d06ea5d079d6
2020-03-06 17:32:26 +00:00
Automerger Merge Worker
eaf72cf8f5
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279 am: 86ce68877f -s ours am: 9a4bdcaca6 -s ours am: deffa903e5 -s ours am: 0d05c94eaa -s ours am: a30dd6d336 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ib3c89f14aa915b6e21b4325c91cbfdd1499c0078
2020-03-06 17:31:35 +00:00
Automerger Merge Worker
7565cd479d
[automerger skipped] Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb -s ours am: eae534cda7 am: b2d8e01b7a am: c397839b8b
...
Change-Id: Ibf9c78b9e4b488fe700e4a2f15842f0008f75b91
2020-03-06 17:20:57 +00:00
Automerger Merge Worker
04174a9391
[automerger skipped] Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb -s ours am: eae534cda7 am: 51692e38d2 am: 8bb9dcabc5
...
Change-Id: Iafb0d7822bcaf236d0b9f04506fe09318addedde
2020-03-06 17:20:34 +00:00
Automerger Merge Worker
31e052bf08
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279 am: 86ce68877f -s ours am: 9a4bdcaca6 -s ours am: b329c29a04 -s ours am: 4876ded481 -s ours
...
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 4a89abe279
2020-03-06 17:19:35 +00:00
Automerger Merge Worker
74b4b59323
[automerger skipped] Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb -s ours am: eae534cda7 am: 51692e38d2 am: 777ac0e39a
...
Change-Id: I9172051ee3bfa4ebf106a8f1c2a96daee110b5ad
2020-03-06 17:19:30 +00:00
Automerger Merge Worker
a30dd6d336
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279 am: 86ce68877f -s ours am: 9a4bdcaca6 -s ours am: deffa903e5 -s ours am: 0d05c94eaa -s ours
...
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 9efc5ab929
2020-03-06 17:19:13 +00:00
Automerger Merge Worker
445e51dd7e
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279 am: 86ce68877f -s ours am: 9a4bdcaca6 -s ours am: deffa903e5 -s ours am: a9d8cc3de6 -s ours
...
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 9efc5ab929
2020-03-06 17:18:05 +00:00
Automerger Merge Worker
c397839b8b
[automerger skipped] Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb -s ours am: eae534cda7 am: b2d8e01b7a
...
Change-Id: I2217e073d230f79a78320c89885d77708b1b6512
2020-03-06 16:59:34 +00:00
Automerger Merge Worker
8bb9dcabc5
[automerger skipped] Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb -s ours am: eae534cda7 am: 51692e38d2
...
Change-Id: If6e4e337c4c056740639fcede35bde246d8cecd9
2020-03-06 16:59:22 +00:00
Automerger Merge Worker
777ac0e39a
[automerger skipped] Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb -s ours am: eae534cda7 am: 51692e38d2
...
Change-Id: I00a4e29b17053932351edec3783b731acabbea22
2020-03-06 16:59:09 +00:00
Automerger Merge Worker
4876ded481
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279 am: 86ce68877f -s ours am: 9a4bdcaca6 -s ours am: b329c29a04 -s ours
...
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 9efc5ab929
2020-03-06 16:58:22 +00:00
Automerger Merge Worker
a9d8cc3de6
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279 am: 86ce68877f -s ours am: 9a4bdcaca6 -s ours am: deffa903e5 -s ours
...
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 9efc5ab929
2020-03-06 16:58:19 +00:00
Automerger Merge Worker
0d05c94eaa
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279 am: 86ce68877f -s ours am: 9a4bdcaca6 -s ours am: deffa903e5 -s ours
...
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 9efc5ab929
2020-03-06 16:58:11 +00:00
Automerger Merge Worker
b2d8e01b7a
[automerger skipped] Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb -s ours am: eae534cda7
...
Change-Id: I4aa269491f46a80bcf05ac2afb4fc428e34ae83a
2020-03-06 16:32:24 +00:00
Automerger Merge Worker
51692e38d2
[automerger skipped] Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb -s ours am: eae534cda7
...
Change-Id: I147730c1dcf6bc77335f6b4c9b8dcc5e96d91c20
2020-03-06 16:32:16 +00:00
Automerger Merge Worker
b329c29a04
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279 am: 86ce68877f -s ours am: 9a4bdcaca6 -s ours
...
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 9efc5ab929
2020-03-06 16:31:58 +00:00
Automerger Merge Worker
deffa903e5
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279 am: 86ce68877f -s ours am: 9a4bdcaca6 -s ours
...
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 9efc5ab929
2020-03-06 16:31:55 +00:00
Automerger Merge Worker
eae534cda7
[automerger skipped] Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb -s ours
...
am skip reason: subject contains skip directive
Change-Id: Id498eb2c8fe327e3639328d488db5900174240ec
2020-03-06 16:18:58 +00:00
Automerger Merge Worker
9a4bdcaca6
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279 am: 86ce68877f -s ours
...
am skip reason: subject contains skip directive
Change-Id: I2ac28217bd616bc49859f09a9eab0a20e1d5d285
2020-03-06 16:17:35 +00:00
Automerger Merge Worker
2f19cfc89d
Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f am: 14d7c1e369 am: e48064ea7f am: e49067b8a1 am: 3d6157d48e
...
Change-Id: I6b3081ba095a31169e919e0868d55540be4fdac1
2020-03-06 15:37:57 +00:00
Automerger Merge Worker
20ccb2eecc
Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f am: 14d7c1e369 am: 16fcf16c45 am: 2c7795f4b6
...
Change-Id: Ic7ae4d614861dd344c127e0ff09a4c88433e5c9f
2020-03-06 15:37:04 +00:00
Automerger Merge Worker
3c65ae3068
Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f am: 1ab6e8b4fb am: bdc4a744a2 am: c0d51ca4cc
...
Change-Id: I539434448c5b6513470041915b2ea892307b0909
2020-03-06 15:36:11 +00:00
Automerger Merge Worker
3d6157d48e
Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f am: 14d7c1e369 am: e48064ea7f am: e49067b8a1
...
Change-Id: I36817768acd64beb8383f004ee895eae0858be8e
2020-03-06 15:26:02 +00:00
Automerger Merge Worker
2c7795f4b6
Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f am: 14d7c1e369 am: 16fcf16c45
...
Change-Id: Ic68676eae2d494822791cc56911230447009cdb7
2020-03-06 15:14:44 +00:00
Automerger Merge Worker
c0d51ca4cc
Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f am: 1ab6e8b4fb am: bdc4a744a2
...
Change-Id: Ie0f428af0000337ba6bdd70c06c34999f37f4216
2020-03-06 15:13:28 +00:00
Automerger Merge Worker
e49067b8a1
Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f am: 14d7c1e369 am: e48064ea7f
...
Change-Id: I5e13a5aecb534a685fea6a5732a960ade81b521d
2020-03-06 15:12:46 +00:00
Julia Reynolds
78b1848509
Log errors on history load
...
Test: manual
Bug: 150336474
Change-Id: I10e0e5ab9d51d88b67678be0f7040c360dcbcbe4
2020-03-06 10:05:30 -05:00
Automerger Merge Worker
8d3a75567c
Merge "Add string for output switcher transferring state" into rvc-dev am: c241e434d5 am: 83fb76a7fd am: a51ed4f14c am: 229e8a35bd am: cc5515f91f
...
Change-Id: Iaab0511f03a7fe17e5ca31c90974ede49aa13c0b
2020-03-06 14:59:57 +00:00
Automerger Merge Worker
08082e51a5
Merge "Add string for output switcher transferring state" into rvc-dev am: c241e434d5 am: ba597a6f39 am: c36d3c6cf4 am: 3d31627014
...
Change-Id: If5a957629c7131814484a43a718969f50e4f5bb7
2020-03-06 14:59:51 +00:00
Automerger Merge Worker
cc5515f91f
Merge "Add string for output switcher transferring state" into rvc-dev am: c241e434d5 am: 83fb76a7fd am: a51ed4f14c am: 229e8a35bd
...
Change-Id: I8b3007d476a683635ce63365bbf1a8e482078f4c
2020-03-06 14:59:46 +00:00
Automerger Merge Worker
a2b813995e
Merge "Add string for output switcher transferring state" into rvc-dev am: c241e434d5 am: 83fb76a7fd am: daf3235a45 am: 7f80142280
...
Change-Id: Ib1e9c9f8ccf718a0f10800a69d89c420bebb6bd3
2020-03-06 14:59:44 +00:00
Automerger Merge Worker
e48064ea7f
Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f am: 14d7c1e369
...
Change-Id: I36ffb4c244418c85861655a6c4e00ed3a0ce1f0e
2020-03-06 14:56:15 +00:00
Automerger Merge Worker
16fcf16c45
Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f am: 14d7c1e369
...
Change-Id: Iab6841572b093b16e7c961becaab72cf839f1ba3
2020-03-06 14:56:08 +00:00
Automerger Merge Worker
bdc4a744a2
Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f am: 1ab6e8b4fb
...
Change-Id: I0794a3dedb843e148fff1e7f74336403be879c44
2020-03-06 14:56:02 +00:00
Automerger Merge Worker
3d31627014
Merge "Add string for output switcher transferring state" into rvc-dev am: c241e434d5 am: ba597a6f39 am: c36d3c6cf4
...
Change-Id: I79073ef8b47ebc61623672fb39a8b8121e45083b
2020-03-06 14:45:33 +00:00
Automerger Merge Worker
229e8a35bd
Merge "Add string for output switcher transferring state" into rvc-dev am: c241e434d5 am: 83fb76a7fd am: a51ed4f14c
...
Change-Id: I5bba3e276f8fd692e172e962aed2a5bb167f69ba
2020-03-06 14:45:23 +00:00
