Automerger Merge Worker
903c040612
Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: 000cbb47b6
...
Change-Id: Iffbe972133a1980f7c524e6b4f2eaf3dd2cd2d47
2020-03-07 17:58:04 +00:00
Automerger Merge Worker
4b0e1b3440
Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: 000cbb47b6
...
Change-Id: I414aed330d2783a5781c039c1a2e9a06cf302730
2020-03-07 17:58:03 +00:00
Automerger Merge Worker
000cbb47b6
Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779
...
Change-Id: Ie1031fb0582a7a2955a7fcaf4eef28d2ddc0c62d
2020-03-07 17:37:50 +00:00
Automerger Merge Worker
ff11b08361
Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779
...
Change-Id: Idfdbf2f0c4684d5fa7934937a39be401a139362a
2020-03-07 17:37:49 +00:00
TreeHugger Robot
29063e3779
Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev
2020-03-07 17:16:05 +00:00
Automerger Merge Worker
df15f18379
Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 0c08f5d44e am: 9796155099 am: ed39063010
...
Change-Id: If3601e7044c0e64c5fd50e94938c62915f218747
2020-03-07 14:34:53 +00:00
Automerger Merge Worker
ed39063010
Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 0c08f5d44e am: 9796155099
...
Change-Id: I3ca51f1ac477ab329cd076713997a3896ac46022
2020-03-07 14:21:32 +00:00
Automerger Merge Worker
1d975fa486
Merge "Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 0c08f5d44e" into rvc-d1-dev-plus-aosp am: 3e841653dc
...
Change-Id: I3a167c01c60b10a258225f53364d3efa65123c72
2020-03-07 13:03:57 +00:00
Automerger Merge Worker
4e12e932c6
Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 384841ce59 am: 020ea67ea3
...
Change-Id: I2d856b616859c7eefd452f1a413e188e1d569dc7
2020-03-07 13:03:49 +00:00
Automerger Merge Worker
3e841653dc
Merge "Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 0c08f5d44e" into rvc-d1-dev-plus-aosp
2020-03-07 12:50:01 +00:00
Automerger Merge Worker
e54fb4abe2
Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 0c08f5d44e
...
Change-Id: Ic7dd524dbf984dba759f0ad0216db0f554c5b57a
2020-03-07 12:49:58 +00:00
Automerger Merge Worker
020ea67ea3
Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 384841ce59
...
Change-Id: Iffdefa0e68f937226353dd4f2536b660acf363bc
2020-03-07 12:49:57 +00:00
Automerger Merge Worker
9796155099
Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 0c08f5d44e
...
Change-Id: Iee76df2a320246cf05ff40a841d5ffbe38cfb11e
2020-03-07 12:49:56 +00:00
Automerger Merge Worker
384841ce59
Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576
...
Change-Id: Ib7321fd67b98731a9c822d2143316d60017bdd2e
2020-03-07 12:39:54 +00:00
Automerger Merge Worker
0c08f5d44e
Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576
...
Change-Id: Ic06643022dc0bb3cbcab00645a6e7bb7669d240b
2020-03-07 12:39:50 +00:00
TreeHugger Robot
4105c9c576
Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev
2020-03-07 12:27:45 +00:00
Automerger Merge Worker
0e727bc36c
Merge "Update enrollment with API update" into rvc-dev am: be753c3543 am: 139caf98f3 am: cf618708e8 am: c938890c53
...
Change-Id: I3d96231b00377de95d5c8e5c95be969cf961e665
2020-03-06 22:57:53 +00:00
Automerger Merge Worker
af467dc447
Merge "Update enrollment with API update" into rvc-dev am: be753c3543 am: 139caf98f3 am: f5d19cb558
...
Change-Id: I0822157f2e2b8d3a3c178c4517a56c4410c68fb7
2020-03-06 22:54:03 +00:00
Automerger Merge Worker
b1f6e93a23
Merge "Update enrollment with API update" into rvc-dev am: be753c3543 am: b7f10b9012 am: 7c04e2f1ae
...
Change-Id: I33c3dd36f979e51466d0451a444b96f05abcb3e4
2020-03-06 22:52:42 +00:00
Automerger Merge Worker
c938890c53
Merge "Update enrollment with API update" into rvc-dev am: be753c3543 am: 139caf98f3 am: cf618708e8
...
Change-Id: I5a21b24048d6fc7854e44d4e0f6b83b489202bb6
2020-03-06 22:52:31 +00:00
Automerger Merge Worker
f5d19cb558
Merge "Update enrollment with API update" into rvc-dev am: be753c3543 am: 139caf98f3
...
Change-Id: Id993d700a2132ef837f302c30942a9b41fd1e9c0
2020-03-06 22:49:31 +00:00
Automerger Merge Worker
7c04e2f1ae
Merge "Update enrollment with API update" into rvc-dev am: be753c3543 am: b7f10b9012
...
Change-Id: Id63c7dc935e2cb68783c6052608597333ca15c7b
2020-03-06 22:46:55 +00:00
Automerger Merge Worker
cf618708e8
Merge "Update enrollment with API update" into rvc-dev am: be753c3543 am: 139caf98f3
...
Change-Id: I94b5cd6d6cffa70d9b77465db6541513c0c17e06
2020-03-06 22:46:06 +00:00
Automerger Merge Worker
b7f10b9012
Merge "Update enrollment with API update" into rvc-dev am: be753c3543
...
Change-Id: If7503971a68c00057e6256ae32f032edc8b61a2d
2020-03-06 22:45:48 +00:00
Automerger Merge Worker
139caf98f3
Merge "Update enrollment with API update" into rvc-dev am: be753c3543
...
Change-Id: I1c4c6ba23c4bac4ef3d88aa0e76d155b515de012
2020-03-06 22:45:14 +00:00
Kevin Chyn
be753c3543
Merge "Update enrollment with API update" into rvc-dev
2020-03-06 22:43:57 +00:00
Automerger Merge Worker
5c56e2f0f3
Merge "[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon" into rvc-dev am: 858cf42516 am: 0e03dfddd7 am: 9423b256fb am: fd40e9e4b8
...
Change-Id: I4f9eda75b0d8efce022d2e981cecd3812476a82d
2020-03-06 22:32:46 +00:00
Automerger Merge Worker
ebb6b02b1e
Merge "[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon" into rvc-dev am: 858cf42516 am: 0e03dfddd7 am: 30ad1ae018
...
Change-Id: I460b494937693c150466a5a758c6144462b79b1e
2020-03-06 22:16:55 +00:00
Automerger Merge Worker
3ffbb869c5
Merge "[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon" into rvc-dev am: 858cf42516 am: e47d1cae4f am: 3806ccd234
...
Change-Id: Iedea545232d8db244454ecee33f2b3e53ed44722
2020-03-06 22:16:14 +00:00
Automerger Merge Worker
fd40e9e4b8
Merge "[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon" into rvc-dev am: 858cf42516 am: 0e03dfddd7 am: 9423b256fb
...
Change-Id: Ieff5447ebeb79498be920359527fa8260a076f28
2020-03-06 22:15:20 +00:00
Automerger Merge Worker
9423b256fb
Merge "[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon" into rvc-dev am: 858cf42516 am: 0e03dfddd7
...
Change-Id: I313e85e71dc915d6fed46fa30076e5d230d54a6d
2020-03-06 22:03:07 +00:00
Automerger Merge Worker
30ad1ae018
Merge "[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon" into rvc-dev am: 858cf42516 am: 0e03dfddd7
...
Change-Id: I3683bfb691c40afcb6c3482106c5bb083dc9f04a
2020-03-06 22:02:40 +00:00
Automerger Merge Worker
3806ccd234
Merge "[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon" into rvc-dev am: 858cf42516 am: e47d1cae4f
...
Change-Id: I82b013c9f85a17826692cf1ebeb4988bc3b903f6
2020-03-06 22:02:33 +00:00
Automerger Merge Worker
0e03dfddd7
Merge "[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon" into rvc-dev am: 858cf42516
...
Change-Id: I445496aac0d27a95e64a2c46c1b6ca965e96888a
2020-03-06 21:47:32 +00:00
Automerger Merge Worker
e47d1cae4f
Merge "[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon" into rvc-dev am: 858cf42516
...
Change-Id: If8394b1d01bd07daeb6d53988a0844467b5fb336
2020-03-06 21:46:58 +00:00
Quang Luong
858cf42516
Merge "[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon" into rvc-dev
2020-03-06 21:36:30 +00:00
Automerger Merge Worker
5989870b51
Merge "Log errors on history load" into rvc-dev am: d27d2b375e am: f77db13ff8 am: acc4e72472 am: 6e9a07ed82
...
Change-Id: I3b9f5eccc897fc71523c5b7646e2159508417d61
2020-03-06 21:23:15 +00:00
Automerger Merge Worker
f79eb1f78c
Merge "Log errors on history load" into rvc-dev am: d27d2b375e am: 045a1c53b0 am: 83585126ce
...
Change-Id: I4fa3dad03a42380f8598989f12cbd9216a1295f2
2020-03-06 21:08:48 +00:00
Automerger Merge Worker
c880f69196
Merge "Log errors on history load" into rvc-dev am: d27d2b375e am: f77db13ff8 am: caa1efc234
...
Change-Id: Ifa16b0dc1909e74e6772a477b0489ae62a0720d8
2020-03-06 21:08:24 +00:00
Automerger Merge Worker
6e9a07ed82
Merge "Log errors on history load" into rvc-dev am: d27d2b375e am: f77db13ff8 am: acc4e72472
...
Change-Id: I397aeea568418fa7e93b0bfc8a6ee08554adb04d
2020-03-06 21:07:48 +00:00
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
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
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
