Commit graph

77755 commits

Author SHA1 Message Date
Automerger Merge Worker
2971e168d5 Merge changes from topic "am-08a155ca62144e49bad1deffa5127df4" am: dd79408db1 am: 8eac375466
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1239888

Change-Id: Ic8d96daefe806ad5d06793f99bd4710b39abc84f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:41:58 +00:00
Treehugger Robot
736f30d1b4 [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 skip reason: skipped by user dmulabagal

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

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

Change-Id: I96ce94b448d5c8e3b3a7cbf8664b8ba6afccd1c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:41:35 +00:00
Treehugger Robot
864fe5f483 [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 skip reason: skipped by user agowdra

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

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

Change-Id: I70aa25ff61d4e9fd6ad16836a0bc5ad1123b8bdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:41:15 +00:00
Treehugger Robot
8721b494ed [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 skip reason: skipped by user trong

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

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

Change-Id: Ife06cbd5d656898cc0728aedeae6d8bbb22fa34d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:40:59 +00:00
Treehugger Robot
61f905530e [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 skip reason: skipped by user dvander

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

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

Change-Id: Icb50863904d9203b83da63cb063917422442fd3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:40:37 +00:00
Treehugger Robot
8edd9eeabd [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 skip reason: skipped by user robinjacob

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

Change-Id: I0859cd42067273acc7981df8859aafb64cc74172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:40:34 +00:00
Automerger Merge Worker
53b88b26ca Merge "[automerger skipped] init: Wait for snapuserd before starting second stage am: 36a78b8e75 -s ours" am: ddaa1b3881 -s ours am: 2644361bd6 -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: Ie9f14d0b15eafb0f1e18e0dff4ff754038fcc681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:40:21 +00:00
Akilesh Kailash
d3f5309ee8 [automerger skipped] init: Wait for snapuserd before starting second stage am: 36a78b8e75 -s ours am: 6a313e174e -s ours am: ab54ca853f -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: Ie356964657f1640f88937b1f0a4e8040f3eb3814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:40:20 +00:00
Automerger Merge Worker
2f464cacc3 Merge "[automerger skipped] libprocessgroup: Use WriteStringToFd for WriteFileAction am: 1458350370 -s ours" am: b486c4f063 -s ours am: 7e1386c74f -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: I4f265686cfdf1ce7abfb78ade14fb0d2ee25b1ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:39:55 +00:00
Rick Yiu
573aff33a7 [automerger skipped] libprocessgroup: Use WriteStringToFd for WriteFileAction am: 1458350370 -s ours am: cff7952df2 -s ours am: 0cad4c44bc -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: I6a33c4b70b70918580e9c1155b0aaf08fd7efb54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:39:54 +00:00
Automerger Merge Worker
acd4515835 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 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: I3f9fa31b061ccbd63a5f57fa8cb8f6233dac66c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:39:22 +00:00
Suren Baghdasaryan
09fac8172b [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 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: I9c13eb923d0d5fb537a7e7da73740a3c34be8bbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:39:21 +00:00
Automerger Merge Worker
c87738013e Merge "Merge "Merge "vts_libsnapshot_test: Fix free space calculation." into android12-tests-dev am: abed76bf3e" into android12L-tests-dev am: 3a4b134e84" am: 51d2d073f2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2066968

Change-Id: I383a4f17f87994fbebbac7dd0f23d9cf905c8901
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:33:20 +00:00
Automerger Merge Worker
87c32dd26c Merge changes from topic "am-fc8f8533e81744278a6d9b7db27b7f19" am: 61c7de1ea8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1915268

Change-Id: I77d7370d9586bfb7b01f972ade5b0fdce5ad02df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:33:02 +00:00
Treehugger Robot
7cb0c7a081 [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 skip reason: skipped by user karthikmr

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

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

Change-Id: Id413d6c647e14cf10790191e174370f430e9298c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:32:39 +00:00
Treehugger Robot
3aa1f1a14a [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 skip reason: skipped by user agowdra

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

Change-Id: Ibb700c3d384b3c24a433759d9e6b92b56ea14e6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:32:39 +00:00
Automerger Merge Worker
5639819569 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
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1726290

Change-Id: I08d383024fca33c11171dab57ba8d265b65af768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:32:11 +00:00
Automerger Merge Worker
a34f5602c8 Merge changes from topic "am-e3d7420e56534d7081c701f1fd958308" am: 0bafc6ab71
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1535382

Change-Id: Ic21860195eeeaf98168657aad22655526747eeb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:31:30 +00:00
Treehugger Robot
4386a46c58 [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 skip reason: skipped by user karthikmr

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

Change-Id: I6275607f6505a35ad04ea3fbe73ad97c5a94596d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:31:28 +00:00
Automerger Merge Worker
055afa8a84 Merge changes from topic "am-c198557146ab441c9702d29824bc857b" am: db915e470b -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: I368d1c7bf93ec7b5fc3a3afb587020dcec856d0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:24:44 +00:00
Automerger Merge Worker
de55d7873a [automerger skipped] Merge changes from topic "am-688679ebddb9459590f4ede853e36462" into android12L-tests-dev am: fb3c951f11 -s ours am: 59cea7f298 -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: Ic005c4c7fab1633bfb7fa46868f8f2f7540be22d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:24:43 +00:00
Automerger Merge Worker
efeb05a778 Merge changes from topic "am-214c591285f74e579baad9171ec87ef7" am: 98ff58fb85 -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: I9f5adf8777356c2fc16eb75553c786cf9cd0e303
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:24:19 +00:00
Automerger Merge Worker
fea3492ef1 [automerger skipped] Merge changes from topic "am-8485851bde534ba18259034d03754b06" into android12L-tests-dev am: 096a880fc7 -s ours am: 1c29513b17 -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: Ife5e102f80f752da24794cf63806dc5b1446b208
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:24:18 +00:00
Automerger Merge Worker
8eac375466 Merge changes from topic "am-08a155ca62144e49bad1deffa5127df4" am: dd79408db1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1239888

Change-Id: Id0eaad95f9c2112a4c9bdceddd1f9e1bba5b7d4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:23:55 +00:00
Treehugger Robot
b12ecc65de [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 skip reason: skipped by user dmulabagal

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

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

Change-Id: Ia2e103933d3e7625f8597da345f59cdc6fb50068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:23:34 +00:00
Treehugger Robot
10797fecda [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 skip reason: skipped by user agowdra

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

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

Change-Id: I5d40ea1bb4a4dba4ccbe212273d579df1559c9e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:23:13 +00:00
Treehugger Robot
b274623e33 [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 skip reason: skipped by user trong

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

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

Change-Id: I349bcdd405653f5c2eeee3be11f826fb8a1dcc74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:22:52 +00:00
Treehugger Robot
137e743681 [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 skip reason: skipped by user dvander

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

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

Change-Id: I9e86ff60f7861f58fed1a86361a117abf0eb6c60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:22:29 +00:00
Treehugger Robot
46e1d974b2 [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 skip reason: skipped by user robinjacob

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

Change-Id: I3359bcf8f36e9f05325674cb47b1876d4260de73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:22:27 +00:00
Automerger Merge Worker
2644361bd6 Merge "[automerger skipped] init: Wait for snapuserd before starting second stage am: 36a78b8e75 -s ours" am: ddaa1b3881 -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: I2d1132f1ee18df9ad67b7eb85ff40963334d8887
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:22:02 +00:00
Akilesh Kailash
ab54ca853f [automerger skipped] init: Wait for snapuserd before starting second stage am: 36a78b8e75 -s ours am: 6a313e174e -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: I1e01f4cb82afc2ae36dc5a43e34e1cd07b8de4f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:22:01 +00:00
Automerger Merge Worker
7e1386c74f Merge "[automerger skipped] libprocessgroup: Use WriteStringToFd for WriteFileAction am: 1458350370 -s ours" am: b486c4f063 -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: Icb042a24bff42ac652e79b86f7aa28ce661667fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:21:48 +00:00
Rick Yiu
0cad4c44bc [automerger skipped] libprocessgroup: Use WriteStringToFd for WriteFileAction am: 1458350370 -s ours am: cff7952df2 -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: I127d7805d4b8d41487bbfe16b783720333910331
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:21:47 +00:00
Automerger Merge Worker
29d679a7d1 Merge "[automerger skipped] libprocessgroup: Prevent error spam when tests disable all cpus in a cpuset am: ea98b60b86 -s ours" am: ed24f00c74 -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: Ib6e433041cd6be2d59f9e50e72247087ad8b2c6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:21:33 +00:00
Suren Baghdasaryan
3adb39a964 [automerger skipped] libprocessgroup: Prevent error spam when tests disable all cpus in a cpuset am: ea98b60b86 -s ours am: f458446476 -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: I237b94e21cbbb19cd47c820878ea8887bb9c2ff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:21:31 +00:00
Automerger Merge Worker
51d2d073f2 Merge "Merge "Merge "vts_libsnapshot_test: Fix free space calculation." into android12-tests-dev am: abed76bf3e" into android12L-tests-dev am: 3a4b134e84" 2022-04-21 01:13:56 +00:00
Automerger Merge Worker
f21fd279b9 Merge "Merge "vts_libsnapshot_test: Fix free space calculation." into android12-tests-dev am: abed76bf3e" into android12L-tests-dev am: 3a4b134e84
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2066968

Change-Id: Ie35c2b7eb4f6470d220b2a91d5039f034fa20769
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:13:54 +00:00
Automerger Merge Worker
61c7de1ea8 Merge changes from topic "am-fc8f8533e81744278a6d9b7db27b7f19"
* changes:
  Merge changes from topic "am-af5f7a0d8d934d269789491a74277af7" into android12L-tests-dev am: 7f3503a52a
  [automerger skipped] Merge "Adding Car GSI public key" into android11-tests-dev am: efcca34203 -s ours am: 6033c0d965 -s ours am: d404d92ae5 -s ours
2022-04-21 01:13:41 +00:00
Automerger Merge Worker
1594611cff Merge changes from topic "am-af5f7a0d8d934d269789491a74277af7" into android12L-tests-dev am: 7f3503a52a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1915268

Change-Id: I2a71a0f5ac0116d0e8cbb9f38d0d6fd4898b3b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:13:38 +00:00
Treehugger Robot
3fdf47aeec [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 skip reason: skipped by user karthikmr

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

Change-Id: Id8c7c1b3172c080e9a0444b71df5d7070f86318a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:13:37 +00:00
Automerger Merge Worker
b09371140f Merge changes from topic "am-c7c1003483a74988b1bd48a340cd06ff"
* changes:
  Merge changes from topic "am-468cea9b039c4e73b38044a2424a425a" into android12L-tests-dev am: aac335af08
  [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
2022-04-21 01:13:18 +00:00