Automerger Merge Worker
56a95edb34
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0
-s ours am: 10caf51f27
-s ours am: 5f2520f685
-s ours am: b2a718f62f
-s ours am: 999977ff27
-s ours am: 135d77ae70
-s ours
...
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f
is in history
Change-Id: Ifaef39b034550da676a3aa196d967ce3aca44e07
2020-03-12 10:41:33 +00:00
Automerger Merge Worker
443230b2bf
[automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1
-s ours am: a3ddb0c4fb
-s ours am: 31933bea45
-s ours am: 18d9d24ee3
-s ours am: 0922e7fdcb
-s ours am: 1b2cdfc1e0
-s ours am: 5d170c119a
-s ours
...
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f
is in history
Change-Id: I9bae710e3fe9e7a6ffce14d1a5f9e4139c7479f4
2020-03-12 10:41:06 +00:00
Automerger Merge Worker
ca4f008287
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2
am: fe302e4867
-s ours am: 6708ebae6d
am: bde8ce85e0
am: 74ae03d4a8
...
Change-Id: I5eb9080c5f33d45f907df7f9d2628fc38da41022
2020-03-12 10:40:33 +00:00
Automerger Merge Worker
193d8cf727
[automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f
am: 19ff9101ee
-s ours am: 7dc37f978c
am: 4cc152835c
am: d37f5b5a7a
...
Change-Id: Ia57cf9fb60941b1bac182f096cc4fcab438059cc
2020-03-12 10:40:31 +00:00
Automerger Merge Worker
b167885376
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f
-s ours am: f816e89f7a
-s ours am: c90737a257
-s ours am: 4302d438b0
-s ours
...
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 4a89abe279
is in history
Change-Id: I1ea434c21fd6f82270ce785470ee4d1a4f282539
2020-03-12 10:40:12 +00:00
Automerger Merge Worker
135d77ae70
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0
-s ours am: 10caf51f27
-s ours am: 5f2520f685
-s ours am: b2a718f62f
-s ours am: 999977ff27
-s ours
...
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f
is in history
Change-Id: Ie0b527622c40aea9d916196c51bf78d02772238b
2020-03-12 10:20:16 +00:00
Automerger Merge Worker
5d170c119a
[automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1
-s ours am: a3ddb0c4fb
-s ours am: 31933bea45
-s ours am: 18d9d24ee3
-s ours am: 0922e7fdcb
-s ours am: 1b2cdfc1e0
-s ours
...
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f
is in history
Change-Id: Ib5ee12b356012e6f159fc58292cfce7e4d0401d5
2020-03-12 10:19:56 +00:00
Automerger Merge Worker
74ae03d4a8
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2
am: fe302e4867
-s ours am: 6708ebae6d
am: bde8ce85e0
...
Change-Id: I6503f9e76785858f5a0b17e4699f8ebd38f75787
2020-03-12 10:19:18 +00:00
Automerger Merge Worker
d37f5b5a7a
[automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f
am: 19ff9101ee
-s ours am: 7dc37f978c
am: 4cc152835c
...
Change-Id: Ic6a1170dbfd47e22a16a0548568582f0be7e7ad1
2020-03-12 10:19:14 +00:00
Automerger Merge Worker
4302d438b0
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f
-s ours am: f816e89f7a
-s ours am: c90737a257
-s ours
...
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 4a89abe279
is in history
Change-Id: Iad03e6bdbd1ee5f7721fa7144ec3c0c228956c47
2020-03-12 10:18:43 +00:00
Automerger Merge Worker
999977ff27
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0
-s ours am: 10caf51f27
-s ours am: 5f2520f685
-s ours am: b2a718f62f
-s ours
...
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f
is in history
Change-Id: Iae2b16273c94c1cfefc3ba1cc377f796c45c4136
2020-03-12 09:55:22 +00:00
Automerger Merge Worker
1b2cdfc1e0
[automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1
-s ours am: a3ddb0c4fb
-s ours am: 31933bea45
-s ours am: 18d9d24ee3
-s ours am: 0922e7fdcb
-s ours
...
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f
is in history
Change-Id: Ic938d11f692384c04b04aac9ddbd643a0983529f
2020-03-12 09:55:01 +00:00
Automerger Merge Worker
bde8ce85e0
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2
am: fe302e4867
-s ours am: 6708ebae6d
...
Change-Id: I6a6e037cc80eb9f2cc505158e5f937b287c05254
2020-03-12 09:54:13 +00:00
Automerger Merge Worker
4cc152835c
[automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f
am: 19ff9101ee
-s ours am: 7dc37f978c
...
Change-Id: I7ece5a97e683dec786ba8c95a7950bc4b4b0d693
2020-03-12 09:54:12 +00:00
Automerger Merge Worker
c90737a257
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f
-s ours am: f816e89f7a
-s ours
...
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 4a89abe279
is in history
Change-Id: I572fec74b56a8e2e4e7f3ca9ecdc536a09a376bc
2020-03-12 09:53:24 +00:00
Automerger Merge Worker
b2a718f62f
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0
-s ours am: 10caf51f27
-s ours am: 5f2520f685
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Icbe574512461d49be73aaca3a3d94779a2017bf4
2020-03-12 09:23:29 +00:00
Automerger Merge Worker
0922e7fdcb
[automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1
-s ours am: a3ddb0c4fb
-s ours am: 31933bea45
-s ours am: 18d9d24ee3
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ibbf2edb55ba4f72cbb1d8c96ab266f841bf31f27
2020-03-12 09:23:22 +00:00
Automerger Merge Worker
6708ebae6d
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2
am: fe302e4867
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I94cea1b92275f86a666fcba6c950bf4b4659531f
2020-03-12 09:23:01 +00:00
Automerger Merge Worker
7dc37f978c
[automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f
am: 19ff9101ee
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I70c3e6daa2e2bbe6e2cef1fcbd1e78cd475fbc20
2020-03-12 09:22:57 +00:00
Automerger Merge Worker
f816e89f7a
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ia4397258a0b87af025c6d8a866c03a060555b462
2020-03-12 09:21:48 +00:00
Automerger Merge Worker
3e46f0e167
Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2
am: cae2447a56
am: 779aa123c7
...
Change-Id: Ia671f444da9ce999aa5a02022f38bbaf6ce033ab
2020-03-12 07:11:00 +00:00
Automerger Merge Worker
bad44347d5
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e
am: c1059b0f25
am: c25ebdfb56
...
Change-Id: I144180075010cdce57933d3d5917dfba2aa66119
2020-03-12 07:10:06 +00:00
Automerger Merge Worker
779aa123c7
Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2
am: cae2447a56
...
Change-Id: I56bbe357b424ade4ce76ba892575c3363bf06c97
2020-03-12 06:55:22 +00:00
Automerger Merge Worker
c25ebdfb56
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e
am: c1059b0f25
...
Change-Id: Ia15ff888a6672e952120888f6348e9b3323540ae
2020-03-12 06:55:03 +00:00
Automerger Merge Worker
cae2447a56
Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2
...
Change-Id: Ic3ec86390758853a91341650e1382215d04ea6d5
2020-03-12 06:42:35 +00:00
Zoey Chen
e34dc697d2
Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev
2020-03-12 06:40:04 +00:00
Automerger Merge Worker
c1059b0f25
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e
...
Change-Id: Ibb0d255c96279db485f4190c98b5fc854826f8a7
2020-03-12 06:39:18 +00:00
Automerger Merge Worker
b6abc73483
Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a
am: 4c69bcab70
am: 9c46665173
...
Change-Id: Iaf9a5af1afd3b0289a0754d310915f024aee01c9
2020-03-12 06:31:29 +00:00
Automerger Merge Worker
ec663b1e15
Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb
am: 9e15dc3582
am: 51b2592d11
...
Change-Id: If6d818c6770910614b63ce502f2a4d506c0f98f2
2020-03-12 06:30:55 +00:00
Calvin Pan
59f5eb638e
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev
2020-03-12 06:25:11 +00:00
Automerger Merge Worker
9c46665173
Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a
am: 4c69bcab70
...
Change-Id: I68a43988057229deae3a5b4c9daff400b6b5393e
2020-03-12 06:18:16 +00:00
Automerger Merge Worker
51b2592d11
Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb
am: 9e15dc3582
...
Change-Id: I7f4cab8841a2be25a59de419fc9a7bf5039312fc
2020-03-12 06:17:55 +00:00
Automerger Merge Worker
4c69bcab70
Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a
...
Change-Id: I80f8b6a996ec4006a225f63d5471ae7f70a2bcb4
2020-03-12 06:03:46 +00:00
Automerger Merge Worker
9e15dc3582
Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb
...
Change-Id: Ib6deaaca23af6c8636e2861a011ff02d982c507b
2020-03-12 06:03:40 +00:00
Menghan Li
873b50a46a
Merge "Update R acessibility assets and strings (2/n)" into rvc-dev
2020-03-12 05:37:32 +00:00
Menghan Li
3fd654becb
Merge "Update R acessibility assets and strings (1/n)" into rvc-dev
2020-03-12 05:37:19 +00:00
Automerger Merge Worker
ac24351d2a
Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c
am: 70f287362c
am: aa16276bbe
...
Change-Id: I270d7649d02a172c15a9fb27c05a3a96b1935fe0
2020-03-12 05:20:28 +00:00
Automerger Merge Worker
aa16276bbe
Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c
am: 70f287362c
...
Change-Id: Id0a18ac99f937486ebfecf026a9252bcd87aa0e0
2020-03-12 05:06:24 +00:00
Automerger Merge Worker
70f287362c
Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c
...
Change-Id: I5f7a480c4dd5b035ad8e61e430d235dcd23c76e6
2020-03-12 04:48:55 +00:00
TreeHugger Robot
40613ef30c
Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev
2020-03-12 04:35:32 +00:00
zoey chen
cf33e51a55
Fix Card 2's pin shows ON when only turn on card 1's pin
...
Bug: 150258187
Test: manual
Change-Id: Ifc54090da6737d31a2eb71eeabe6846592ff32fc
Merged-In: Ifc54090da6737d31a2eb71eeabe6846592ff32fc
2020-03-12 03:56:46 +00:00
Automerger Merge Worker
0167f39446
Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814
am: 93fedb0e3f
am: e5c6d8a658
...
Change-Id: Ic7242f092def9d02cf05d6960f11bd1a5406878d
2020-03-12 03:37:06 +00:00
Automerger Merge Worker
e5c6d8a658
Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814
am: 93fedb0e3f
...
Change-Id: I8dae29cedff1eb8b29d3244ae0b3343ae51fbed7
2020-03-12 03:16:20 +00:00
Automerger Merge Worker
93fedb0e3f
Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814
...
Change-Id: If84bded0c61524cda613f57ff0b7839817655eae
2020-03-12 03:04:00 +00:00
TreeHugger Robot
a7bd169814
Merge "Fix WifiTetherSettingsTest" into rvc-dev
2020-03-12 02:54:35 +00:00
Automerger Merge Worker
5f2520f685
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0
-s ours am: 10caf51f27
-s ours
...
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f
is in history
Change-Id: I19964afedd126b92b35977cc0a97abe1b8fb9ffc
2020-03-12 02:09:20 +00:00
Automerger Merge Worker
10caf51f27
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I26c2fcfc1c38818d168667d1121a0cde3018c566
2020-03-12 01:51:17 +00:00
TreeHugger Robot
f2754332a0
Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev
2020-03-12 01:35:21 +00:00
Automerger Merge Worker
1eab1674c7
Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7
am: 61eb0791a3
am: 8e6abb67ff
...
Change-Id: Id7239efe8844ff59d90bdcb35135b4a76a9a4419
2020-03-12 01:14:34 +00:00
Automerger Merge Worker
8e6abb67ff
Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7
am: 61eb0791a3
...
Change-Id: I512522a3b88a90acf6655f3867987a676911e8d4
2020-03-12 00:55:54 +00:00