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
141451127a
Merge "Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 4636557ab7" into rvc-d1-dev-plus-aosp
2020-03-12 06:17:59 +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
fe7cf5f899
Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 4636557ab7
...
Change-Id: I86d9bd3407b616621eebeb14f8980c9edc0fec1a
2020-03-12 06:17:55 +00:00
Automerger Merge Worker
5ed8894807
Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 4c69bcab70
...
Change-Id: Ia3e222438b0716557f23bf6d2e39a2de9abe7cd9
2020-03-12 06:17:51 +00:00
Automerger Merge Worker
d137a12391
Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 9e15dc3582
...
Change-Id: Ib117c57c211d00b8bff1efcef59e4f6eb789a794
2020-03-12 06:17:36 +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
548e9e0370
Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a
...
Change-Id: I4ec3a3d4e082fb5f49de2aa1a48482e98afa9951
2020-03-12 06:03:43 +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
Automerger Merge Worker
4636557ab7
Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb
...
Change-Id: Ifd71046d26c35b9bd400d1bc9a164e2210630280
2020-03-12 06:03:23 +00:00
Automerger Merge Worker
9aaeec79e6
Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c am: 70f287362c am: aa16276bbe am: ac24351d2a am: 48b6e13a2f
...
Change-Id: Ia9cfc3d3e1bf39f34ee247d44e52b6351fa5d18b
2020-03-12 05:54:24 +00:00
Automerger Merge Worker
48b6e13a2f
Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c am: 70f287362c am: aa16276bbe am: ac24351d2a
...
Change-Id: I0070b75ceade1d9607df4b051ffbca2bed756b73
2020-03-12 05:41:26 +00:00
Automerger Merge Worker
89a5580b49
Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c am: 3cce160521 am: 65621e32a2 am: 22e733f301
...
Change-Id: I81e2aba684a1fb06c4d71ae219ee4745297373f1
2020-03-12 05:41:12 +00:00
Automerger Merge Worker
e192eb634e
Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c am: 70f287362c am: 9701a87b2d am: 37187c8141
...
Change-Id: I45dec95c06fe45e980bb4f62230058a20f059332
2020-03-12 05:40:59 +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
22e733f301
Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c am: 3cce160521 am: 65621e32a2
...
Change-Id: I5901de77bbc04c876ea6aff2226635923eb2c780
2020-03-12 05:20:35 +00:00
Automerger Merge Worker
37187c8141
Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c am: 70f287362c am: 9701a87b2d
...
Change-Id: Id8b58eb824f69bce458224b92738a30d209cfc42
2020-03-12 05:20:29 +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
65621e32a2
Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c am: 3cce160521
...
Change-Id: Ie2914126f17d11c8115ae4d3c178a4c6259e71d5
2020-03-12 05:06:47 +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
9701a87b2d
Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c am: 70f287362c
...
Change-Id: I352a8e1ab7b7654f490d43d5291f60c68f9aa2e4
2020-03-12 05:05:50 +00:00
Automerger Merge Worker
3cce160521
Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c
...
Change-Id: I345c9b8ccfcb801605066c2f0d14fe4b7a292d80
2020-03-12 04:49:10 +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
02d70a66f0
Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814 am: 93fedb0e3f am: e5c6d8a658 am: 0167f39446 am: dff2648a5e
...
Change-Id: I58cd16ce4d67c1df7a6fbefb6ea8d5a4790eea32
2020-03-12 03:56:00 +00:00
Automerger Merge Worker
dff2648a5e
Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814 am: 93fedb0e3f am: e5c6d8a658 am: 0167f39446
...
Change-Id: I871c3d68a76238d790ac2d95c7a68c111a0b29ca
2020-03-12 03:49:30 +00:00
Automerger Merge Worker
951e76cc04
Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814 am: ee7f5bc540 am: aa62a717b5 am: 81838c23be
...
Change-Id: I119b96901883250edb1ba303842f6c73dd48644b
2020-03-12 03:49:22 +00:00
Automerger Merge Worker
b73276489c
Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814 am: 93fedb0e3f am: 9bd2280297 am: 1c9951fde6
...
Change-Id: Ie4c08847d5073c54b71827ed7f8cc19428628a3c
2020-03-12 03:49:06 +00:00
Automerger Merge Worker
81838c23be
Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814 am: ee7f5bc540 am: aa62a717b5
...
Change-Id: Icbb4bd4cbbba793e9ddec873ea416155d4809fad
2020-03-12 03:37:12 +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
1c9951fde6
Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814 am: 93fedb0e3f am: 9bd2280297
...
Change-Id: Ib9250a76a28ef2eb99d7d5ea1f27f272173d1c38
2020-03-12 03:37:06 +00:00
Automerger Merge Worker
aa62a717b5
Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814 am: ee7f5bc540
...
Change-Id: I18e7ba4726768df945913d906b47583dce9b1a3d
2020-03-12 03:16:21 +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
9bd2280297
Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814 am: 93fedb0e3f
...
Change-Id: Ibb0a7616784160bbf2be0242bf42cd1125411ab8
2020-03-12 03:15:53 +00:00
Automerger Merge Worker
ee7f5bc540
Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814
...
Change-Id: I343b3a129ef3875d45aabd52a9ffae85f14b8fcf
2020-03-12 03:04:12 +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
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
0ec302419e
Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7 am: 61eb0791a3 am: 8e6abb67ff am: 1eab1674c7 am: 349395663d
...
Change-Id: Ib84c2d3a9bc9e294121001752fed39a766f522a2
2020-03-12 01:31:15 +00:00
Automerger Merge Worker
4707ddb6f9
[automerger skipped] Merge "MetricId: Avoid byte[] and string ambiguity" am: 291ff22d7b am: 61167e098e -s ours am: 631493c8e7 am: 2564fce75b am: e27f6ef6fa
...
Change-Id: I62d92bf95bd0f4c0928dc118186815e791c02edf
2020-03-12 01:30:56 +00:00
Automerger Merge Worker
410a105c0c
Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7 am: 86fac6caee am: 98f50c04d4 am: 0d62a0687a
...
Change-Id: I92f78105e5130213f6878bd5ffd6c5d71245fcc2
2020-03-12 01:30:30 +00:00
Automerger Merge Worker
73b3a58636
Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7 am: 61eb0791a3 am: 2776dbfa08 am: fa134a16ee
...
Change-Id: Ib3238204bc319c40b8b852f487e831a04fc5ccd7
2020-03-12 01:29:09 +00:00
Automerger Merge Worker
349395663d
Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7 am: 61eb0791a3 am: 8e6abb67ff am: 1eab1674c7
...
Change-Id: I8f7e642ac02c04061a6279631c76795c67e269f7
2020-03-12 01:27:31 +00:00
Automerger Merge Worker
e27f6ef6fa
[automerger skipped] Merge "MetricId: Avoid byte[] and string ambiguity" am: 291ff22d7b am: 61167e098e -s ours am: 631493c8e7 am: 2564fce75b
...
Change-Id: Ie1b45ae946d62be4bb27d9850dcf50149340f431
2020-03-12 01:17:41 +00:00
Automerger Merge Worker
0d62a0687a
Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7 am: 86fac6caee am: 98f50c04d4
...
Change-Id: I8ba0f6eb7af1e8efde1eb3d7f29d81551cfc1485
2020-03-12 01:16:57 +00:00
Automerger Merge Worker
fa134a16ee
Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7 am: 61eb0791a3 am: 2776dbfa08
...
Change-Id: I1b906898dc6ea91d62f80544c1e1a15c44557d29
2020-03-12 01:14:47 +00:00
