Commit graph

75545 commits

Author SHA1 Message Date
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
Treehugger Robot
1f061d7540 [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 skip reason: skipped by user agowdra

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

Change-Id: I1fa9f4a24e033a1dfcbff7874f14914362dc3627
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:13:14 +00:00
Automerger Merge Worker
c3c2643a8b 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" 2022-04-21 01:12:55 +00:00
Automerger Merge Worker
92c83b3d47 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
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1726290

Change-Id: I5988f66d41af54127829baa6edb3a3217a99e583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:12:53 +00:00
Automerger Merge Worker
0bafc6ab71 Merge changes from topic "am-e3d7420e56534d7081c701f1fd958308"
* changes:
  Merge changes from topic "am-7206c583f34949c299ce90858cf1afd5" into android12L-tests-dev am: 865187fd2c
  [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
2022-04-21 01:12:43 +00:00
Automerger Merge Worker
db210f56ff Merge changes from topic "am-7206c583f34949c299ce90858cf1afd5" into android12L-tests-dev am: 865187fd2c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1535382

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

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

Change-Id: Id2f5bcebee06911e98501a3678e764fcb8c86b4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:12:37 +00:00
Automerger Merge Worker
db915e470b Merge changes from topic "am-c198557146ab441c9702d29824bc857b"
* changes:
  Merge changes from topic "am-688679ebddb9459590f4ede853e36462" into android12L-tests-dev am: fb3c951f11 -s ours
  Merge "[automerger skipped] Merge "Merge "fuzzy_fastboot: use 'tcp:' prefix to identify fastboot protocol." into android10-tests-dev am: da84e29fdf" into android11-tests-dev am: 48ca333cb6 -s ours" into android12-tests-dev am: 3f04f905ce -s ours am: aa6d2eacf4 -s ours
2022-04-21 01:11:10 +00:00
Automerger Merge Worker
59cea7f298 Merge changes from topic "am-688679ebddb9459590f4ede853e36462" into android12L-tests-dev am: fb3c951f11 -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: I412c33ac742c4a0bf3a6d78f7286860d5765eccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:11:05 +00:00
Automerger Merge Worker
8b9ca3110d Merge "[automerger skipped] Merge "Merge "fuzzy_fastboot: use 'tcp:' prefix to identify fastboot protocol." into android10-tests-dev am: da84e29fdf" into android11-tests-dev am: 48ca333cb6 -s ours" into android12-tests-dev am: 3f04f905ce -s ours am: aa6d2eacf4 -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: If69569f83b728bb3c12a3b32867a70cf9dfba885
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:11:04 +00:00
Automerger Merge Worker
98ff58fb85 Merge changes from topic "am-214c591285f74e579baad9171ec87ef7"
* changes:
  Merge changes from topic "am-8485851bde534ba18259034d03754b06" into android12L-tests-dev am: 096a880fc7 -s ours
  Merge "Merge "[automerger skipped] Merge "Restore fastboot delete-logical-partition command for VTS" into android10-tests-dev am: 2c8ca771e7 -s ours" into android11-tests-dev am: 6d0ec70e01 -s ours" into android12-tests-dev am: 4ffcef6ce7 -s ours am: 8b69af92f9 -s ours
2022-04-21 01:10:31 +00:00
Automerger Merge Worker
1c29513b17 Merge changes from topic "am-8485851bde534ba18259034d03754b06" into android12L-tests-dev am: 096a880fc7 -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: I9033fd1c71d9b8c1ba2d22aa749b67c0e3847229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:10:28 +00:00
Automerger Merge Worker
792e3925ba Merge "Merge "[automerger skipped] Merge "Restore fastboot delete-logical-partition command for VTS" into android10-tests-dev am: 2c8ca771e7 -s ours" into android11-tests-dev am: 6d0ec70e01 -s ours" into android12-tests-dev am: 4ffcef6ce7 -s ours am: 8b69af92f9 -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: I46f275e004122f98561cac73a929b35aa4c2419c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:10:27 +00:00
Automerger Merge Worker
dd79408db1 Merge changes from topic "am-08a155ca62144e49bad1deffa5127df4"
* changes:
  Merge changes from topic "am-3e79d381eef4408781e0e24c77daba88" into android12L-tests-dev am: e5fdc5a93b
  [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
2022-04-21 01:10:13 +00:00
Automerger Merge Worker
de4038e818 Merge changes from topic "am-3e79d381eef4408781e0e24c77daba88" into android12L-tests-dev am: e5fdc5a93b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1239888

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

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

Change-Id: Iff496292bb431a8e639aa5b589027f6f0fce9ef1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:10:08 +00:00
Automerger Merge Worker
844c30f06d Merge changes from topic "am-21021e63687c4f87a5f7335ff8fb0483"
* changes:
  Merge changes from topic "am-3afb14f2ca7649c780c6884f53a799b4" into android12L-tests-dev am: b4287bf117
  [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
2022-04-21 01:09:51 +00:00
Automerger Merge Worker
88b0c1e3f2 Merge changes from topic "am-3afb14f2ca7649c780c6884f53a799b4" into android12L-tests-dev am: b4287bf117
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1168004

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

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

Change-Id: I2b5ad73b542db4bb27c73240fd6463fa0e235082
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:09:46 +00:00
Automerger Merge Worker
d33cbfdce5 Merge changes from topic "am-cc11d65e1ffe4630b407596190df86a1"
* changes:
  Merge changes from topic "am-32562e4e7a11481995df723a3616eb3d" into android12L-tests-dev am: fd515cbdfd
  [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
2022-04-21 01:09:30 +00:00
Automerger Merge Worker
3b790e38dd Merge changes from topic "am-32562e4e7a11481995df723a3616eb3d" into android12L-tests-dev am: fd515cbdfd
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1201445

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

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

Change-Id: I06ec5ada86795a38819fc394b44ab23a3aaadf0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:09:25 +00:00
Automerger Merge Worker
144bb9fd77 Merge changes from topic "am-e06fd6bc4686461e856b869e6648426a"
* changes:
  Merge changes from topic "am-d53d0500e829445dade5c7974fab4e25" into android12L-tests-dev am: 142b07c4c0
  [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
2022-04-21 01:09:08 +00:00
Automerger Merge Worker
e6cf8a2ad7 Merge changes from topic "am-d53d0500e829445dade5c7974fab4e25" into android12L-tests-dev am: 142b07c4c0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1150077

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

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

Change-Id: I540915c9b355eb729c5ce47aa7dbe93e8ef547e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:09:03 +00:00
Automerger Merge Worker
437a607b27 Merge changes from topic "am-160c9f8b5caf40a2a0b6fae94210de90"
* changes:
  Merge changes from topic "am-eacec02142be4022b9d5a32720baa092" into android12L-tests-dev am: def183bea7
  [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
2022-04-21 01:08:45 +00:00
Automerger Merge Worker
31f94385cd Merge changes from topic "am-eacec02142be4022b9d5a32720baa092" into android12L-tests-dev am: def183bea7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1146576

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