Automerger Merge Worker
c8302adca5
Merge "Update failed test case" into rvc-dev am: 9e5142b14d am: 423133c22b am: d6aa406045 am: 5e19adc7f9
...
Change-Id: I1c426b3402ec1a75b97e8dc7b5b084b66619aa0c
2020-03-09 02:59:33 +00:00
Automerger Merge Worker
1796c347f5
Merge "Update failed test case" into rvc-dev am: 9e5142b14d am: 3bc7a52a36 am: 6a121c73c7 am: 90b95b0c38
...
Change-Id: I22dde390c44b9bd87b9efd2501b4af3b5b466d4d
2020-03-09 02:58:54 +00:00
Arc Wang
ced9c346a5
[Wi-Fi] Remove redundant code
...
Should not setSummary in ConnectedWifiEntryPreference because
WifiEntryPreference updates summary by WifiEntry#getSummary
Bug: 150911380
Test: manual
See captive portal Wi-Fi summary 'Sign in to network'
before logging in.
Change-Id: Ibc47623d66b9d2844c0ca827081f205f0bab89e7
2020-03-09 10:47:58 +08:00
Automerger Merge Worker
5e19adc7f9
Merge "Update failed test case" into rvc-dev am: 9e5142b14d am: 423133c22b am: d6aa406045
...
Change-Id: I3b9f8ee94452b43623437e2e88856cfba10c2831
2020-03-09 02:38:12 +00:00
Automerger Merge Worker
90b95b0c38
Merge "Update failed test case" into rvc-dev am: 9e5142b14d am: 3bc7a52a36 am: 6a121c73c7
...
Change-Id: Ibba21f2252885acebec44164081d227f7b70d42e
2020-03-09 02:36:49 +00:00
Automerger Merge Worker
d6aa406045
Merge "Update failed test case" into rvc-dev am: 9e5142b14d am: 423133c22b
...
Change-Id: I982afbcb983942f1d0d02d2be08d29389c2bddec
2020-03-09 02:21:37 +00:00
Automerger Merge Worker
e7e0c7a17b
Merge "Update failed test case" into rvc-dev am: 9e5142b14d am: 423133c22b
...
Change-Id: I0c78605f8d96dd8d3ee05c3c48ae451c037a0ba2
2020-03-09 02:21:24 +00:00
Automerger Merge Worker
6a121c73c7
Merge "Update failed test case" into rvc-dev am: 9e5142b14d am: 3bc7a52a36
...
Change-Id: Icdb9198be6abf0c1e4625438438e23a062085c9b
2020-03-09 02:21:06 +00:00
Automerger Merge Worker
423133c22b
Merge "Update failed test case" into rvc-dev am: 9e5142b14d
...
Change-Id: Ibe535a64b8f369575ea1dbeafb04b31017599642
2020-03-09 02:11:10 +00:00
Automerger Merge Worker
3bc7a52a36
Merge "Update failed test case" into rvc-dev am: 9e5142b14d
...
Change-Id: Ia0a7848915d207d69b051cfee0ef1547ae98a0f6
2020-03-09 02:10:34 +00:00
tim peng
9e5142b14d
Merge "Update failed test case" into rvc-dev
2020-03-09 01:53:35 +00:00
Automerger Merge Worker
cd6da6b76a
[automerger skipped] Import translations. DO NOT MERGE am: 9ce0e0ca55 -s ours am: 75b92d9a07 -s ours am: 66e7c85589 -s ours am: 7cafa9db06 -s ours am: 3036bdf7d1 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Idb3f018a60f1840c4e8792e5c11a790a2e165d74
2020-03-08 23:12:35 +00:00
Automerger Merge Worker
3036bdf7d1
[automerger skipped] Import translations. DO NOT MERGE am: 9ce0e0ca55 -s ours am: 75b92d9a07 -s ours am: 66e7c85589 -s ours am: 7cafa9db06 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I9ce20f1ad6f16022bddd897d8432c0a35525a301
2020-03-08 23:02:56 +00:00
Automerger Merge Worker
7cafa9db06
[automerger skipped] Import translations. DO NOT MERGE am: 9ce0e0ca55 -s ours am: 75b92d9a07 -s ours am: 66e7c85589 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I07f2ca595573f52eed6d6b3a43fb7846f87c80b1
2020-03-08 22:49:00 +00:00
Automerger Merge Worker
deecb165ef
[automerger skipped] Import translations. DO NOT MERGE am: 9ce0e0ca55 -s ours am: 75b92d9a07 -s ours am: 0204e72806 -s ours am: 5d3efb26a3 -s ours
...
am skip reason: subject contains skip directive
Change-Id: If50e155bc9240208878665e1b8657b967a5150f2
2020-03-08 21:02:45 +00:00
Automerger Merge Worker
d4d7032abd
[automerger skipped] Import translations. DO NOT MERGE am: 9ce0e0ca55 -s ours am: 824aec4faf -s ours am: 2f97987e14 -s ours am: f5fd755190 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ib0a80fe1c712fc5b3c8bdd8be2849ee75d0f3f32
2020-03-08 21:02:29 +00:00
Automerger Merge Worker
5d3efb26a3
[automerger skipped] Import translations. DO NOT MERGE am: 9ce0e0ca55 -s ours am: 75b92d9a07 -s ours am: 0204e72806 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ic11f89b8f6169d463cfecde60ccdffaf6d60bfab
2020-03-08 20:48:26 +00:00
Automerger Merge Worker
f5fd755190
[automerger skipped] Import translations. DO NOT MERGE am: 9ce0e0ca55 -s ours am: 824aec4faf -s ours am: 2f97987e14 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I93ee7fc54d593c31680e3fb689dc1c4050593cd1
2020-03-08 20:48:12 +00:00
Automerger Merge Worker
0204e72806
[automerger skipped] Import translations. DO NOT MERGE am: 9ce0e0ca55 -s ours am: 75b92d9a07 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie719fca620201d22714e469d66a4a3a661ceec65
2020-03-08 20:38:03 +00:00
Automerger Merge Worker
66e7c85589
[automerger skipped] Import translations. DO NOT MERGE am: 9ce0e0ca55 -s ours am: 75b92d9a07 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I67bf8139e48a1b5ba0e606024e616568fc0a9627
2020-03-08 20:38:02 +00:00
Automerger Merge Worker
2f97987e14
[automerger skipped] Import translations. DO NOT MERGE am: 9ce0e0ca55 -s ours am: 824aec4faf -s ours
...
am skip reason: subject contains skip directive
Change-Id: I34869c5020fc83627fd3fc48bf2f89ac0166b2db
2020-03-08 20:37:54 +00:00
Automerger Merge Worker
75b92d9a07
[automerger skipped] Import translations. DO NOT MERGE am: 9ce0e0ca55 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ib2bf0fa6dcc48cc989c8deda90f8ac012e648a41
2020-03-08 20:22:26 +00:00
Automerger Merge Worker
824aec4faf
[automerger skipped] Import translations. DO NOT MERGE am: 9ce0e0ca55 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I4f446401a416b8720e06c08882649f719b4dd215
2020-03-08 20:22:16 +00:00
Automerger Merge Worker
a0e2baa33d
[automerger skipped] Merge "PreferredNetworkModePreferenceController's summary no 5G item" am: a49021a71e am: 1ec7c14b3b -s ours am: c799d3bc49 -s ours am: aeeb6405a1 -s ours am: abbead8a71 -s ours
...
am skip reason: Change-Id I5fa42e48b8c073b4c4933b32417c2cbeada09a40 with SHA-1 8598dccce1
2020-03-08 06:08:01 +00:00
Bill Yi
9ce0e0ca55
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I7966ad0beaa4bde063f8fc3ec17ce152b9acb3ac
2020-03-07 22:06:24 -08:00
Automerger Merge Worker
abbead8a71
[automerger skipped] Merge "PreferredNetworkModePreferenceController's summary no 5G item" am: a49021a71e am: 1ec7c14b3b -s ours am: c799d3bc49 -s ours am: aeeb6405a1 -s ours
...
am skip reason: Change-Id I5fa42e48b8c073b4c4933b32417c2cbeada09a40 with SHA-1 8598dccce1
2020-03-08 05:52:53 +00:00
Automerger Merge Worker
aeeb6405a1
[automerger skipped] Merge "PreferredNetworkModePreferenceController's summary no 5G item" am: a49021a71e am: 1ec7c14b3b -s ours am: c799d3bc49 -s ours
...
am skip reason: Change-Id I5fa42e48b8c073b4c4933b32417c2cbeada09a40 with SHA-1 8598dccce1
2020-03-08 05:39:10 +00:00
Automerger Merge Worker
c799d3bc49
[automerger skipped] Merge "PreferredNetworkModePreferenceController's summary no 5G item" am: a49021a71e am: 1ec7c14b3b -s ours
...
am skip reason: Change-Id I5fa42e48b8c073b4c4933b32417c2cbeada09a40 with SHA-1 8598dccce1
2020-03-08 05:26:30 +00:00
Automerger Merge Worker
1ec7c14b3b
Merge "PreferredNetworkModePreferenceController's summary no 5G item" am: a49021a71e
...
Change-Id: Ia3bdc608b679922f93398ba3c11a9f393374548a
2020-03-08 05:10:45 +00:00
Treehugger Robot
a49021a71e
Merge "PreferredNetworkModePreferenceController's summary no 5G item"
2020-03-08 04:52:56 +00:00
Automerger Merge Worker
675f9e39b3
Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: 000cbb47b6 am: 4b0e1b3440 am: c984dca0eb am: 4bfb3bd6a0
...
Change-Id: I4caebe9b9b41c7cf6c56279e9128a2ddae5a432a
2020-03-07 23:20:15 +00:00
Automerger Merge Worker
203c3a8d7e
Merge "Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: 000cbb47b6" into rvc-d1-dev-plus-aosp am: 7f72b3d0b6 am: 48cf7ebb43
...
Change-Id: I4864460f92c3be42cb8230e739e3d69b4d0d9c02
2020-03-07 23:19:40 +00:00
Automerger Merge Worker
c4e1408a30
Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: ff11b08361 am: 241f426e36 am: dcbe174ab5
...
Change-Id: I3a449473066ae36f13cae1f36f9a2ace98836f83
2020-03-07 23:18:44 +00:00
Automerger Merge Worker
7e1c9610d4
Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 0c08f5d44e am: 9796155099 am: ed39063010 am: df15f18379
...
Change-Id: Iaefe6b5c6a175ee74e517592aebe7eac7d522885
2020-03-07 23:18:08 +00:00
Automerger Merge Worker
f01b173153
Merge "Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 0c08f5d44e" into rvc-d1-dev-plus-aosp am: 3e841653dc am: 1d975fa486
...
Change-Id: I8f4d87f5b992fb518a3d1261bec14576bcf2e91e
2020-03-07 23:14:53 +00:00
Automerger Merge Worker
65de37658f
Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 384841ce59 am: 020ea67ea3 am: 4e12e932c6
...
Change-Id: Ie07352e96a52b6aaf4dff60bf800c8e83d353c51
2020-03-07 23:14:22 +00:00
Automerger Merge Worker
f7bb8c4e62
Merge "Update enrollment with API update" into rvc-dev am: be753c3543 am: 139caf98f3 am: cf618708e8 am: c938890c53 am: 0e727bc36c
...
Change-Id: Ida6c2ff7544920977898a7e31d69ed697b2e0143
2020-03-07 23:14:09 +00:00
Automerger Merge Worker
a512737c0a
Merge "Update enrollment with API update" into rvc-dev am: be753c3543 am: 139caf98f3 am: f5d19cb558 am: af467dc447
...
Change-Id: Ib6ea187fbe0e6fe68d46926ff8e4ea8d59de80a7
2020-03-07 23:12:10 +00:00
Automerger Merge Worker
95e7500990
Merge "Update enrollment with API update" into rvc-dev am: be753c3543 am: b7f10b9012 am: 7c04e2f1ae am: b1f6e93a23
...
Change-Id: I3afd81544b454285ce7fb5e1e18a84b605151986
2020-03-07 23:10:16 +00:00
Automerger Merge Worker
4bfb3bd6a0
Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: 000cbb47b6 am: 4b0e1b3440 am: c984dca0eb
...
Change-Id: Id5645d69dcc736fa2da38201fe60f0390f65efa3
2020-03-07 19:37:23 +00:00
Automerger Merge Worker
c984dca0eb
Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: 000cbb47b6 am: 4b0e1b3440
...
Change-Id: I95b2d415975ea7b5b2955d6179faab021dd9f98d
2020-03-07 19:22:56 +00:00
Automerger Merge Worker
48cf7ebb43
Merge "Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: 000cbb47b6" into rvc-d1-dev-plus-aosp am: 7f72b3d0b6
...
Change-Id: If76765582d04979d6b1a4b56aa071d2f54000c00
2020-03-07 18:08:32 +00:00
Automerger Merge Worker
dcbe174ab5
Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: ff11b08361 am: 241f426e36
...
Change-Id: I4404bdebcba053c57122ae9931d7717a9e8904fc
2020-03-07 18:08:25 +00:00
Automerger Merge Worker
7f72b3d0b6
Merge "Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: 000cbb47b6" into rvc-d1-dev-plus-aosp
2020-03-07 17:58:12 +00:00
Automerger Merge Worker
241f426e36
Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: ff11b08361
...
Change-Id: I1d748b7ebdfd430023fa5ed47d0867f8dd7a1504
2020-03-07 17:58:06 +00:00
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
