Commit Graph

60580 Commits

Author SHA1 Message Date
Automerger Merge Worker
05ce582a97 Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 9e15dc3582 am: 51b2592d11 am: ec663b1e15
Change-Id: I12d1035dac37228b921c7b863f857a11ec4a4fe8
2020-03-12 06:42:51 +00:00
Automerger Merge Worker
051bf1bd58 Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 548e9e0370 am: c7501141ba
Change-Id: I7cb9630b99be9891ad9994d708cb479e6b8e8eb1
2020-03-12 06:31:48 +00:00
Automerger Merge Worker
441b50a0f2 Merge "Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 4636557ab7" into rvc-d1-dev-plus-aosp am: 141451127a
Change-Id: Ie62d2806d00cbf9ac374f4b0f9e90a0048d0e30d
2020-03-12 06:31:43 +00:00
Automerger Merge Worker
e5be54a8f4 Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 4c69bcab70 am: 5ed8894807
Change-Id: I9fa93764a09a4f216db6cb3507c20e6c12c14d25
2020-03-12 06:31:28 +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
Automerger Merge Worker
81f18805dd Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 9e15dc3582 am: d137a12391
Change-Id: I1e08ca603df32db2d67eab07dd252792e77aaea9
2020-03-12 06:30:54 +00:00
Automerger Merge Worker
c7501141ba Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 548e9e0370
Change-Id: I2bcc38d576f22a10a9e49c60f7963797496423e7
2020-03-12 06:18:24 +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
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
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
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
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
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
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
2564fce75b [automerger skipped] Merge "MetricId: Avoid byte[] and string ambiguity" am: 291ff22d7b am: 61167e098e -s ours am: 631493c8e7
Change-Id: I05246bc5a8550495c4467946d68e9b2ca9630b7a
2020-03-12 00:58:13 +00:00
Automerger Merge Worker
98f50c04d4 Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7 am: 86fac6caee
Change-Id: Id4c6dcad47a067c76a2dcfe1eea1be07768ff068
2020-03-12 00:56:45 +00:00
Automerger Merge Worker
2776dbfa08 Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7 am: 61eb0791a3
Change-Id: Ifc411a318a26169cd3d65e120e8978217377c6a8
2020-03-12 00:56:14 +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
Automerger Merge Worker
61eb0791a3 Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7
Change-Id: I4094a00c4bf9b04300243a8ff11984e95ac793c1
2020-03-12 00:40:12 +00:00
Automerger Merge Worker
631493c8e7 [automerger skipped] Merge "MetricId: Avoid byte[] and string ambiguity" am: 291ff22d7b am: 61167e098e -s ours
am skip reason: skipped by user siyuanh

Change-Id: I0c69f31c9a4e16d3e6f479feddcf2ab452cab8a8
2020-03-12 00:39:59 +00:00
Automerger Merge Worker
86fac6caee Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7
Change-Id: I856ecc8f4edacd4879e0e72b81460504d5f8548e
2020-03-12 00:39:49 +00:00