Commit graph

77773 commits

Author SHA1 Message Date
Treehugger Robot
ff1750c5f6 Merge "Fix lints from Rust 1.60.0" 2022-04-21 05:35:46 +00:00
Automerger Merge Worker
2a27e3253b Merge "Merge "Merge "vts_libsnapshot_test: Fix free space calculation." into android12-tests-dev am: abed76bf3e" into android12L-tests-dev am: 3a4b134e84" am: 51d2d073f2 am: c87738013e am: 426f6ea274 am: fb5b83e812
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2066968

Change-Id: Iad581b751d84b06b4ea11140f29979315a177a15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:45:10 +00:00
Automerger Merge Worker
fec9a286ad Merge changes from topic "am-fc8f8533e81744278a6d9b7db27b7f19" am: 61c7de1ea8 am: 87c32dd26c am: 255db29a64 am: 51137c823a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1915268

Change-Id: I66a3e86b44b8dbdf3afd647cfba49e20fcd6737a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:44:54 +00:00
Treehugger Robot
fcbab17dda [automerger skipped] Merge "Adding Car GSI public key" into android11-tests-dev am: efcca34203 -s ours am: 6033c0d965 -s ours am: d404d92ae5 -s ours am: 3fdf47aeec -s ours am: 7cb0c7a081 -s ours am: a96b20d0cc -s ours am: 866940372f -s ours
am skip reason: skipped by user karthikmr

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1915268

Change-Id: I94ccc308b1a505acc5d4a5b4aaa997141fa6f3e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:44:53 +00:00
Automerger Merge Worker
08405c80a5 Merge changes from topic "am-c7c1003483a74988b1bd48a340cd06ff" am: b09371140f am: 6e97bd823a am: a38fbb28f2 am: 65ef7ee905
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1844795

Change-Id: I9c404f81d57693331a9dd39999fd56fc7216730b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:44:40 +00:00
Treehugger Robot
895cf6186a [automerger skipped] Merge "liblog: use unique log tags for is_loggable tests" into android11-tests-dev am: 47bcb9a647 -s ours am: 3ff0b1b643 -s ours am: 797bd92ef4 -s ours am: 1f061d7540 -s ours am: 3aa1f1a14a -s ours am: 4abe7a1ca5 -s ours am: 27b282c33b -s ours
am skip reason: skipped by user agowdra

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1844795

Change-Id: Idb1094d5b93255f86154381d11f9a110a70df068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:44:39 +00:00
Automerger Merge Worker
401c4ba5ff Merge "Merge "Merge "Merge "resolve merge conflicts of 21ef3ae3fd to android11-tests-dev" into android11-tests-dev am: bdf02cc54d" into android12-tests-dev am: fdca6ffb38" into android12L-tests-dev am: c1a6b27d21" am: c3c2643a8b am: 5639819569 am: bab2b5417f am: ac8a0291ac
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1726290

Change-Id: Ib53843f88865b1bd05f315fd0326ad455bb757f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:44:17 +00:00
Automerger Merge Worker
9b26a64dce Merge changes from topic "am-e3d7420e56534d7081c701f1fd958308" am: 0bafc6ab71 am: a34f5602c8 am: 2e9b830d1a am: 183fcac6a0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1535382

Change-Id: I6b7d95834a06f22515545016be8614748e2bc125
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:43:55 +00:00
Treehugger Robot
4b3c1a7235 [automerger skipped] Merge "Adding Car GSI public key" into android10-tests-dev am: 3d7e667b0a -s ours am: 191b82f0e9 -s ours am: 1c78a382bd -s ours am: 6b79f7df2e -s ours am: 3bf8fbebbb -s ours am: 4386a46c58 -s ours am: 43268d5c7e -s ours am: 4d3d94f934 -s ours
am skip reason: skipped by user karthikmr

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1535382

Change-Id: I29071bc2c45375ba7f3959a388b79f7bd4dd42ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:43:52 +00:00
Automerger Merge Worker
1aa2c6a9c2 [automerger skipped] Merge changes from topic "am-c198557146ab441c9702d29824bc857b" am: db915e470b -s ours am: 055afa8a84 -s ours am: ac67a15e51 -s ours am: bcf36c5c95 -s ours
am skip reason: Merged-In I971fd9e25741e18bf7f5907d562556b09db1d624 with SHA-1 0e743a25c9 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1364665

Change-Id: Ie1d207e73f4a1b3b4a3852990d50fb810e0b4ac1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:42:59 +00:00
Automerger Merge Worker
7603cfea79 [automerger skipped] Merge changes from topic "am-688679ebddb9459590f4ede853e36462" into android12L-tests-dev am: fb3c951f11 -s ours am: 59cea7f298 -s ours am: de55d7873a -s ours am: cff3203d47 -s ours am: 0cc57bdd86 -s ours
am skip reason: Merged-In I971fd9e25741e18bf7f5907d562556b09db1d624 with SHA-1 0e743a25c9 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1364665

Change-Id: I689863be2b88eef6d2b2e7e84f4c2d47743fa6c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:42:56 +00:00
Automerger Merge Worker
ed26354da9 [automerger skipped] Merge changes from topic "am-214c591285f74e579baad9171ec87ef7" am: 98ff58fb85 -s ours am: efeb05a778 -s ours am: 6520fe6893 -s ours am: f4861eccee -s ours
am skip reason: Merged-In I00366b281eafa5677b0941419a86f2702fb3484b with SHA-1 65e8e3803e is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1258132

Change-Id: Ie8bf0cefa0a24e92eafc20629cf699ecfca6becd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:42:42 +00:00
Automerger Merge Worker
c513f612ab [automerger skipped] Merge changes from topic "am-8485851bde534ba18259034d03754b06" into android12L-tests-dev am: 096a880fc7 -s ours am: 1c29513b17 -s ours am: fea3492ef1 -s ours am: 606bc7766d -s ours am: d51805173c -s ours
am skip reason: Merged-In I00366b281eafa5677b0941419a86f2702fb3484b with SHA-1 019f731097 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1258132

Change-Id: Idb09e2dcc5ee6f3b1474c41bd5a3c32658d00abf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:42:41 +00:00
Automerger Merge Worker
481b3538bf Merge changes from topic "am-08a155ca62144e49bad1deffa5127df4" am: dd79408db1 am: 8eac375466 am: 2971e168d5 am: 4a9dd74be1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1239888

Change-Id: I0aeb377af13f4baf9c654727b89847f3e6a772f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:42:29 +00:00
Treehugger Robot
7fed38cd96 [automerger skipped] Merge "Don't require bootloader fastboot for VTS compliance." into android10-tests-dev am: cd7a018917 -s ours am: 606088f724 -s ours am: c422e0a592 -s ours am: 5a3f06cb8b -s ours am: 12b91b0d69 -s ours am: b12ecc65de -s ours am: 736f30d1b4 -s ours am: b6077475ba -s ours
am skip reason: skipped by user dmulabagal

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1239888

Change-Id: I526f1ed27da0b0fe88e0703590a918de75e13ea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:42:28 +00:00
Automerger Merge Worker
f1a1bcfb14 Merge changes from topic "am-21021e63687c4f87a5f7335ff8fb0483" am: 844c30f06d am: 8a453b99aa am: 06746988bc am: e32193be53
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1168004

Change-Id: Id8150770d007cd26454871e99e0500ded68305b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:42:14 +00:00
Treehugger Robot
052d67611d [automerger skipped] Merge "Allow fuzzy_fastboot test devices over internet" into android10-tests-dev am: ea5c4aa4e6 -s ours am: 350698a44c -s ours am: 759ae1ffcc -s ours am: afbf9f72b5 -s ours am: e02ac475ef -s ours am: 10797fecda -s ours am: 864fe5f483 -s ours am: 708ca48247 -s ours
am skip reason: skipped by user agowdra

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1168004

Change-Id: Ic60438ca8a605c3e0c182f8008664eb8c080a81f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:42:12 +00:00
Automerger Merge Worker
06a55c94d1 Merge changes from topic "am-cc11d65e1ffe4630b407596190df86a1" am: d33cbfdce5 am: 562daf465d am: b4fe62bdf5 am: cc779ba111
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1201445

Change-Id: Ifb2b2a0b4329afd3099f01ae4607dc138efbc303
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:41:58 +00:00
Treehugger Robot
a33b04bec6 [automerger skipped] Merge "VtsKernelMemInfoTest: only enforce on Q+ launching devices" into android10-tests-dev am: db5c1bc4ab -s ours am: cc1a7a2abb -s ours am: a5cdf4bdae -s ours am: 8dabf09a22 -s ours am: b858dc37dc -s ours am: b274623e33 -s ours am: 8721b494ed -s ours am: ba6b8e3d74 -s ours
am skip reason: skipped by user trong

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1201445

Change-Id: I8a6a5aaa86be79d25ed946de089e3bbecf385ce4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:41:56 +00:00
Automerger Merge Worker
bf3262deae Merge changes from topic "am-e06fd6bc4686461e856b869e6648426a" am: 144bb9fd77 am: 4187e800db am: fa359aeacb am: b581b18a19
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1150077

Change-Id: Ib96dc2bd5f3bad4ff46e31a53c435ab6f1aa5420
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:41:42 +00:00
Treehugger Robot
930dbbe864 [automerger skipped] Merge "Fiemap tests should only run on API level >= 29." into android10-tests-dev am: dd948046ab -s ours am: a26b9ad1bd -s ours am: 2406c3cde1 -s ours am: 56b51d35a2 -s ours am: c802c41a96 -s ours am: 137e743681 -s ours am: 61f905530e -s ours am: d120d24eb4 -s ours
am skip reason: skipped by user dvander

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1150077

Change-Id: Ie7ba6efbe0a3ad4ac4aaac25cc5cb58a39440146
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:41:41 +00:00
Automerger Merge Worker
6122bdebfa Merge changes from topic "am-160c9f8b5caf40a2a0b6fae94210de90" am: 437a607b27 am: ba89dafc3f am: f7b1614bd5 am: def27ce201
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1146576

Change-Id: I1b65cf42c0772ba6c07996780de60873abf71e4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:41:26 +00:00
Treehugger Robot
e7ecc6b357 [automerger skipped] Merge "Extend test timeout for VtsFiemapWriterTest" into android10-tests-dev am: 50037a6212 -s ours am: 2b889498a2 -s ours am: c18b24e749 -s ours am: 75792a6ec3 -s ours am: 036425ff0e -s ours am: 46e1d974b2 -s ours am: 8edd9eeabd -s ours am: 70ad10b154 -s ours
am skip reason: skipped by user robinjacob

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1146576

Change-Id: I9f55097a71f55f967ec5daf6f6624ed40d86d889
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:41:25 +00:00
Automerger Merge Worker
45fe8a68e2 Merge "[automerger skipped] init: Wait for snapuserd before starting second stage am: 36a78b8e75 -s ours" am: ddaa1b3881 -s ours am: 2644361bd6 -s ours am: 53b88b26ca -s ours am: a09950c32f -s ours
am skip reason: Merged-In I86c2de977de052bfe9dcdc002dcbd9026601d0f3 with SHA-1 fd5562b0a5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/17062063

Change-Id: I3882f8ce06bbcfb7494ae7cd3e931897a5967e1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:41:11 +00:00
Akilesh Kailash
b941fc736a [automerger skipped] init: Wait for snapuserd before starting second stage am: 36a78b8e75 -s ours am: 6a313e174e -s ours am: ab54ca853f -s ours am: d3f5309ee8 -s ours am: 00415bfe6b -s ours
am skip reason: Merged-In I86c2de977de052bfe9dcdc002dcbd9026601d0f3 with SHA-1 fd5562b0a5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/17062063

Change-Id: Ib4f7451a05c33994f58afd6b600097f3cc442b2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:41:10 +00:00
Automerger Merge Worker
daf35df2b5 Merge "[automerger skipped] libprocessgroup: Use WriteStringToFd for WriteFileAction am: 1458350370 -s ours" am: b486c4f063 -s ours am: 7e1386c74f -s ours am: 2f464cacc3 -s ours am: 3e99cddef9 -s ours
am skip reason: Merged-In Id79f9e1095f52079393c58edb9a4d526f4cc6b5e with SHA-1 d4c53518fe is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/17061322

Change-Id: Id096e260cc1686dcd016460d8b4cd94e35ca78a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:41:03 +00:00
Rick Yiu
9301a9d41b [automerger skipped] libprocessgroup: Use WriteStringToFd for WriteFileAction am: 1458350370 -s ours am: cff7952df2 -s ours am: 0cad4c44bc -s ours am: 573aff33a7 -s ours am: b83b16e6d2 -s ours
am skip reason: Merged-In Id79f9e1095f52079393c58edb9a4d526f4cc6b5e with SHA-1 d4c53518fe is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/17061322

Change-Id: Ia9ec1df47d53614716fea54ef5011c4cad66311a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:41:03 +00:00
Automerger Merge Worker
baddfbd292 Merge "[automerger skipped] libprocessgroup: Prevent error spam when tests disable all cpus in a cpuset am: ea98b60b86 -s ours" am: ed24f00c74 -s ours am: 29d679a7d1 -s ours am: acd4515835 -s ours am: be254c15b1 -s ours
am skip reason: Merged-In Ia91d8839d86787569c255481bde077be51c43d93 with SHA-1 ec88556460 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/17061321

Change-Id: I34c9eafbf2262532cf18df06112f64440c37230d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:40:56 +00:00
Suren Baghdasaryan
f4155e5a47 [automerger skipped] libprocessgroup: Prevent error spam when tests disable all cpus in a cpuset am: ea98b60b86 -s ours am: f458446476 -s ours am: 3adb39a964 -s ours am: 09fac8172b -s ours am: bf23b81a75 -s ours
am skip reason: Merged-In Ia91d8839d86787569c255481bde077be51c43d93 with SHA-1 ec88556460 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/17061321

Change-Id: I56720c63bc3ad8401b35ec9e7b03a13f8396e26a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:40:55 +00:00
Automerger Merge Worker
fb5b83e812 Merge "Merge "Merge "vts_libsnapshot_test: Fix free space calculation." into android12-tests-dev am: abed76bf3e" into android12L-tests-dev am: 3a4b134e84" am: 51d2d073f2 am: c87738013e am: 426f6ea274
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2066968

Change-Id: I02be4d2eb25a6a7de0d97719987be330dd5837ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:27:05 +00:00
Automerger Merge Worker
51137c823a Merge changes from topic "am-fc8f8533e81744278a6d9b7db27b7f19" am: 61c7de1ea8 am: 87c32dd26c am: 255db29a64
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1915268

Change-Id: Ie289e2121630b06af2ca89ec0a11e84f2420b535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:26:43 +00:00
Treehugger Robot
866940372f [automerger skipped] Merge "Adding Car GSI public key" into android11-tests-dev am: efcca34203 -s ours am: 6033c0d965 -s ours am: d404d92ae5 -s ours am: 3fdf47aeec -s ours am: 7cb0c7a081 -s ours am: a96b20d0cc -s ours
am skip reason: skipped by user karthikmr

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1915268

Change-Id: I8cc268076ce4888386c6089d3c6f24e23b9a24ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:26:42 +00:00
Automerger Merge Worker
65ef7ee905 Merge changes from topic "am-c7c1003483a74988b1bd48a340cd06ff" am: b09371140f am: 6e97bd823a am: a38fbb28f2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1844795

Change-Id: I2bae4386603c1492e1e7c12121f9dfc031ba3f79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:26:21 +00:00
Treehugger Robot
27b282c33b [automerger skipped] Merge "liblog: use unique log tags for is_loggable tests" into android11-tests-dev am: 47bcb9a647 -s ours am: 3ff0b1b643 -s ours am: 797bd92ef4 -s ours am: 1f061d7540 -s ours am: 3aa1f1a14a -s ours am: 4abe7a1ca5 -s ours
am skip reason: skipped by user agowdra

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1844795

Change-Id: I67c79b5abba73645174274dea9b3bca5be3e21ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:26:20 +00:00
Automerger Merge Worker
ac8a0291ac Merge "Merge "Merge "Merge "resolve merge conflicts of 21ef3ae3fd to android11-tests-dev" into android11-tests-dev am: bdf02cc54d" into android12-tests-dev am: fdca6ffb38" into android12L-tests-dev am: c1a6b27d21" am: c3c2643a8b am: 5639819569 am: bab2b5417f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1726290

Change-Id: If709246da0db705ed8e89f3939efe55af4270a71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:25:50 +00:00
Automerger Merge Worker
183fcac6a0 Merge changes from topic "am-e3d7420e56534d7081c701f1fd958308" am: 0bafc6ab71 am: a34f5602c8 am: 2e9b830d1a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1535382

Change-Id: I5016cb28938d4ba29a87bd8e1ea984d9a289dc2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:25:17 +00:00
Treehugger Robot
4d3d94f934 [automerger skipped] Merge "Adding Car GSI public key" into android10-tests-dev am: 3d7e667b0a -s ours am: 191b82f0e9 -s ours am: 1c78a382bd -s ours am: 6b79f7df2e -s ours am: 3bf8fbebbb -s ours am: 4386a46c58 -s ours am: 43268d5c7e -s ours
am skip reason: skipped by user karthikmr

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1535382

Change-Id: I55838d5674708b3162770a2a60f4fe039be8cc8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:25:14 +00:00
Automerger Merge Worker
bcf36c5c95 [automerger skipped] Merge changes from topic "am-c198557146ab441c9702d29824bc857b" am: db915e470b -s ours am: 055afa8a84 -s ours am: ac67a15e51 -s ours
am skip reason: Merged-In I971fd9e25741e18bf7f5907d562556b09db1d624 with SHA-1 0e743a25c9 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1364665

Change-Id: I39cff584dc58d840438e906e16b4a6cfd7131d4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:23:55 +00:00
Automerger Merge Worker
0cc57bdd86 [automerger skipped] Merge changes from topic "am-688679ebddb9459590f4ede853e36462" into android12L-tests-dev am: fb3c951f11 -s ours am: 59cea7f298 -s ours am: de55d7873a -s ours am: cff3203d47 -s ours
am skip reason: Merged-In I971fd9e25741e18bf7f5907d562556b09db1d624 with SHA-1 0e743a25c9 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1364665

Change-Id: I53a1bf8bb3e611dbc8014e38f4e0acfdcd11ba04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:23:53 +00:00
Automerger Merge Worker
f4861eccee [automerger skipped] Merge changes from topic "am-214c591285f74e579baad9171ec87ef7" am: 98ff58fb85 -s ours am: efeb05a778 -s ours am: 6520fe6893 -s ours
am skip reason: Merged-In I00366b281eafa5677b0941419a86f2702fb3484b with SHA-1 65e8e3803e is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1258132

Change-Id: I07c4c815bbbad0dfc5f9821e3535516fe562f308
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:23:37 +00:00
Automerger Merge Worker
d51805173c [automerger skipped] Merge changes from topic "am-8485851bde534ba18259034d03754b06" into android12L-tests-dev am: 096a880fc7 -s ours am: 1c29513b17 -s ours am: fea3492ef1 -s ours am: 606bc7766d -s ours
am skip reason: Merged-In I00366b281eafa5677b0941419a86f2702fb3484b with SHA-1 019f731097 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1258132

Change-Id: I74b6fa4d4a73c6cb0fc12aa6891bc82c9a8b7770
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:23:35 +00:00
Automerger Merge Worker
4a9dd74be1 Merge changes from topic "am-08a155ca62144e49bad1deffa5127df4" am: dd79408db1 am: 8eac375466 am: 2971e168d5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1239888

Change-Id: I56195ee8c748dd443aa8e258436d0d6d0c6b3904
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:23:21 +00:00
Treehugger Robot
b6077475ba [automerger skipped] Merge "Don't require bootloader fastboot for VTS compliance." into android10-tests-dev am: cd7a018917 -s ours am: 606088f724 -s ours am: c422e0a592 -s ours am: 5a3f06cb8b -s ours am: 12b91b0d69 -s ours am: b12ecc65de -s ours am: 736f30d1b4 -s ours
am skip reason: skipped by user dmulabagal

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1239888

Change-Id: Ib16eaee45f47db4b10f4e41156004ddddd6b29d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:23:19 +00:00
Automerger Merge Worker
e32193be53 Merge changes from topic "am-21021e63687c4f87a5f7335ff8fb0483" am: 844c30f06d am: 8a453b99aa am: 06746988bc
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1168004

Change-Id: I5064aadcdfdcfd3742ed0ed4459e501d6153e05b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:23:02 +00:00
Treehugger Robot
708ca48247 [automerger skipped] Merge "Allow fuzzy_fastboot test devices over internet" into android10-tests-dev am: ea5c4aa4e6 -s ours am: 350698a44c -s ours am: 759ae1ffcc -s ours am: afbf9f72b5 -s ours am: e02ac475ef -s ours am: 10797fecda -s ours am: 864fe5f483 -s ours
am skip reason: skipped by user agowdra

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1168004

Change-Id: I98ad0433b51e4204e689ee7128f615f7958262e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:23:00 +00:00
Automerger Merge Worker
cc779ba111 Merge changes from topic "am-cc11d65e1ffe4630b407596190df86a1" am: d33cbfdce5 am: 562daf465d am: b4fe62bdf5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1201445

Change-Id: I49cc43ad1e7645596fa6abc43fb4592124a2d9e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:22:43 +00:00
Treehugger Robot
ba6b8e3d74 [automerger skipped] Merge "VtsKernelMemInfoTest: only enforce on Q+ launching devices" into android10-tests-dev am: db5c1bc4ab -s ours am: cc1a7a2abb -s ours am: a5cdf4bdae -s ours am: 8dabf09a22 -s ours am: b858dc37dc -s ours am: b274623e33 -s ours am: 8721b494ed -s ours
am skip reason: skipped by user trong

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1201445

Change-Id: If3e8c41d55ffe7fd3e3786fa52fa1a1cff9d2174
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:22:42 +00:00
Automerger Merge Worker
b581b18a19 Merge changes from topic "am-e06fd6bc4686461e856b869e6648426a" am: 144bb9fd77 am: 4187e800db am: fa359aeacb
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1150077

Change-Id: I2ea39267ea3fe1c30d58c0600ccf5dd150e481dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:22:26 +00:00
Treehugger Robot
d120d24eb4 [automerger skipped] Merge "Fiemap tests should only run on API level >= 29." into android10-tests-dev am: dd948046ab -s ours am: a26b9ad1bd -s ours am: 2406c3cde1 -s ours am: 56b51d35a2 -s ours am: c802c41a96 -s ours am: 137e743681 -s ours am: 61f905530e -s ours
am skip reason: skipped by user dvander

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1150077

Change-Id: If337452137f25da0bdb0abacb46b0a40d31c8837
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:22:24 +00:00
Automerger Merge Worker
def27ce201 Merge changes from topic "am-160c9f8b5caf40a2a0b6fae94210de90" am: 437a607b27 am: ba89dafc3f am: f7b1614bd5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1146576

Change-Id: I591f768be01bd66c08ca3ba17ac247ab877ec8fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:22:08 +00:00