)]}' { "log": [ { "commit": "fc7e9e39b30dfed460fb4cb4dc6177aa52c267c7", "tree": "4e9989f562f227694c8c5ec17d070edc788f00de", "parents": [ "407f65fd8a43d004c3d7e1305b5c7c08857afd84", "1eaf0325a85a3e3169d976010381aa568a79d662" ], "author": { "name": "Drew Davenport", "email": "ddavenport@google.com", "time": "Fri Jan 10 13:49:51 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 10 13:49:51 2025 -0800" }, "message": "yukawa: Switch to HWC3 am: 1eaf0325a8\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3443934\n\nChange-Id: Ia5bc4d58d23738fbab51a05d029c1ae5617ae353\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1eaf0325a85a3e3169d976010381aa568a79d662", "tree": "4e9989f562f227694c8c5ec17d070edc788f00de", "parents": [ "a20e20c30d8f80d245a5199d90768798716960e1" ], "author": { "name": "Drew Davenport", "email": "ddavenport@google.com", "time": "Wed Jan 08 21:36:27 2025 -0700" }, "committer": { "name": "Drew Davenport", "email": "ddavenport@google.com", "time": "Fri Jan 10 09:44:54 2025 -0700" }, "message": "yukawa: Switch to HWC3\n\n- Define a new build target to build drm_hwcomposer using the legacy\n bufferinfo implementation\n- Remove HWC2 related build targets\n- Update sepolicy and manifest\n\nBug: 368598993\nTest: presubmit\nChange-Id: I358261653367baae7ccc571f722d752badf91de0\n" }, { "commit": "407f65fd8a43d004c3d7e1305b5c7c08857afd84", "tree": "37a3534bc2d4cd95e6b535326de7ab2a44383446", "parents": [ "e42afb70e677a595620f5aef70325d42f0f4daff", "4b7f360039ea063352050d8f4d58ca0a17f700d4" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 20 13:39:35 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 20 13:39:35 2024 -0800" }, "message": "Empty merge ab/12770256 into aosp-main-future\n\nMerged-In: I3dc11b32f29cc5f889fa6984afc8990105789bf0\nChange-Id: Ieda93a77019059d06210df71810cb3525a88682a\n" }, { "commit": "e42afb70e677a595620f5aef70325d42f0f4daff", "tree": "37a3534bc2d4cd95e6b535326de7ab2a44383446", "parents": [ "359060ca986647d177428c35be303187bc87bbf2", "a20e20c30d8f80d245a5199d90768798716960e1" ], "author": { "name": "Maxime Fournier", "email": "mfournier@baylibre.com", "time": "Wed Dec 18 14:51:20 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Dec 18 14:51:20 2024 -0800" }, "message": "yukawa: vendor-package: update vendor package to 20241217 am: a20e20c30d\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3421880\n\nChange-Id: Ie72773aa3ad36481b0f4a6a23ed29d9201cf318c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a20e20c30d8f80d245a5199d90768798716960e1", "tree": "37a3534bc2d4cd95e6b535326de7ab2a44383446", "parents": [ "e3bd74b9066100c948080b804f63ce87d3b0f13c" ], "author": { "name": "Maxime Fournier", "email": "mfournier@baylibre.com", "time": "Tue Dec 17 18:28:04 2024 +0100" }, "committer": { "name": "Maxime Fournier", "email": "mfournier@baylibre.com", "time": "Wed Dec 18 15:04:18 2024 +0100" }, "message": "yukawa: vendor-package: update vendor package to 20241217\n\nThis version adds a safeguard arround gpu libGLES_mali module\nto prevent conflict with other vendor packages using the same module.\n\nChange-Id: I4366ce0bd90f61383024501edc3266ed0a1a6b86\nSigned-off-by: Maxime Fournier \u003cmfournier@baylibre.com\u003e\n" }, { "commit": "359060ca986647d177428c35be303187bc87bbf2", "tree": "ac633bfde5f42dfb50d2a54835fd4269fd84157d", "parents": [ "aa041ce08180ef3333cda6864627e7b24195da05", "e3bd74b9066100c948080b804f63ce87d3b0f13c" ], "author": { "name": "Maxime Fournier", "email": "mfournier@baylibre.com", "time": "Tue Dec 17 10:52:17 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Dec 17 10:52:17 2024 -0800" }, "message": "yukawa: vendor-package: update vendor package to 20241213 am: e3bd74b906\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3412724\n\nChange-Id: I88a9b7a25142e8220a6f0dd0a25ea8d4ef171b9d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "aa041ce08180ef3333cda6864627e7b24195da05", "tree": "16c29a9fddc948f95174170d17e8702e59b14e57", "parents": [ "282eb4b194f561501352e958b9ef0551887c0fc2", "fcfc396cf1aae8b5c24e9e2fb77e5741edd6d626" ], "author": { "name": "Maxime Fournier", "email": "mfournier@baylibre.com", "time": "Tue Dec 17 10:52:14 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Dec 17 10:52:14 2024 -0800" }, "message": "yukawa: import bootloader from vendor package am: fcfc396cf1\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3412723\n\nChange-Id: I537b78a2c37999533d5b65016cef8a8542b55411\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "282eb4b194f561501352e958b9ef0551887c0fc2", "tree": "09995b161eebdf4673a7bc2bd20a9c56d7520e9d", "parents": [ "63e4c801dc88a9fe4767cb0f6eac3f776bffd139", "18bf1e52aa219b91b3afc078111f806c545113ed" ], "author": { "name": "Guillaume La Roque", "email": "glaroque@baylibre.com", "time": "Tue Dec 17 10:52:11 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Dec 17 10:52:11 2024 -0800" }, "message": "yukawa: manifest: update device manifest to level 8 am: 18bf1e52aa\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3253421\n\nChange-Id: Ib3f6bcbc431676f602ff9d1fe6f3308a06441eae\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "63e4c801dc88a9fe4767cb0f6eac3f776bffd139", "tree": "a4a5b5ea17d803430972c9f2a73d78aeb8027cd1", "parents": [ "a0f3c8bc983d307a12309a8bd0aeef67f10b7505", "8e61fb8573298bc231c545635cf37cd63843b555" ], "author": { "name": "Guillaume La Roque", "email": "glaroque@baylibre.com", "time": "Tue Dec 17 10:49:48 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Dec 17 10:49:48 2024 -0800" }, "message": "yukawa: device: reorder device.mk for hal and deps am: 8e61fb8573\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3253419\n\nChange-Id: I39649ee6397a5f3379fcd348670bad0ce2b4fa73\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a0f3c8bc983d307a12309a8bd0aeef67f10b7505", "tree": "4587f5b51031c19859d4225c5e700b46276813ad", "parents": [ "4ae4b36bb736cb2a27c83eeeeee4f625df997384", "13ab2acb298350251c8870dd5214e88e23978fcb" ], "author": { "name": "Guillaume La Roque", "email": "glaroque@baylibre.com", "time": "Mon Dec 16 11:16:55 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 16 11:16:55 2024 -0800" }, "message": "yukawa: Move CEC interface to vintf_fragment am: 13ab2acb29\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3253418\n\nChange-Id: Ia0df9bdf0c5a22d897722da528b878aaba398dee\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4ae4b36bb736cb2a27c83eeeeee4f625df997384", "tree": "8b6232a145726d04942c026cafd322fd3e9d7dc1", "parents": [ "11cc885393e8e9077e0dd6ce1f32f27e5e7c3867", "80cdbe679b8509dc99bba0f52d40d9a6f21f3735" ], "author": { "name": "Guillaume La Roque", "email": "glaroque@baylibre.com", "time": "Mon Dec 16 11:16:51 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 16 11:16:51 2024 -0800" }, "message": "yukawa: Clean up and rework am: 80cdbe679b\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3253417\n\nChange-Id: I9c915f186b93662c533cc757009a56d31199fa40\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e3bd74b9066100c948080b804f63ce87d3b0f13c", "tree": "ac633bfde5f42dfb50d2a54835fd4269fd84157d", "parents": [ "fcfc396cf1aae8b5c24e9e2fb77e5741edd6d626" ], "author": { "name": "Maxime Fournier", "email": "mfournier@baylibre.com", "time": "Fri Dec 13 11:59:54 2024 +0100" }, "committer": { "name": "Maxime Fournier", "email": "mfournier@baylibre.com", "time": "Mon Dec 16 19:59:23 2024 +0100" }, "message": "yukawa: vendor-package: update vendor package to 20241213\n\nUpdate bluetooth and wifi firmwares\nUpdate bootloader to uboot v2024.01-rc1\n\nChange-Id: Ia81d126a38b1c82da1b6a04cd334f6d8a6d0030e\nSigned-off-by: Maxime Fournier \u003cmfournier@baylibre.com\u003e\n" }, { "commit": "fcfc396cf1aae8b5c24e9e2fb77e5741edd6d626", "tree": "16c29a9fddc948f95174170d17e8702e59b14e57", "parents": [ "18bf1e52aa219b91b3afc078111f806c545113ed" ], "author": { "name": "Maxime Fournier", "email": "mfournier@baylibre.com", "time": "Fri Nov 15 17:18:44 2024 +0100" }, "committer": { "name": "Maxime Fournier", "email": "mfournier@baylibre.com", "time": "Mon Dec 16 19:59:23 2024 +0100" }, "message": "yukawa: import bootloader from vendor package\n\nBootloader will be copied from the vendor package to the\nbuild output directory.\n\nChange-Id: Iec91fbd3b91f422b09dc43747900370db69590dd\nSigned-off-by: Maxime Fournier \u003cmfournier@baylibre.com\u003e\n" }, { "commit": "18bf1e52aa219b91b3afc078111f806c545113ed", "tree": "09995b161eebdf4673a7bc2bd20a9c56d7520e9d", "parents": [ "8e61fb8573298bc231c545635cf37cd63843b555" ], "author": { "name": "Guillaume La Roque", "email": "glaroque@baylibre.com", "time": "Tue Jan 23 13:21:26 2024 +0100" }, "committer": { "name": "Maxime Fournier", "email": "mfournier@baylibre.com", "time": "Mon Dec 16 19:59:23 2024 +0100" }, "message": "yukawa: manifest: update device manifest to level 8\n\nUpdate HAL, matrix and sepolicy to move on level 8 for device manifest.\nAlign some files with generic file from google:\n- cuttlefish\n- BoardConfigMainlineCommon.mk\n\nChange-Id: I126704b42910310cce7eb8651d6dacda5f911c61\nSigned-off-by: Guillaume La Roque \u003cglaroque@baylibre.com\u003e\nSigned-off-by: Maxime Fournier \u003cmfournier@baylibre.com\u003e\n" }, { "commit": "8e61fb8573298bc231c545635cf37cd63843b555", "tree": "a4a5b5ea17d803430972c9f2a73d78aeb8027cd1", "parents": [ "13ab2acb298350251c8870dd5214e88e23978fcb" ], "author": { "name": "Guillaume La Roque", "email": "glaroque@baylibre.com", "time": "Mon Dec 11 20:15:38 2023 +0100" }, "committer": { "name": "Maxime Fournier", "email": "mfournier@baylibre.com", "time": "Mon Dec 16 19:59:20 2024 +0100" }, "message": "yukawa: device: reorder device.mk for hal and deps\n\nreorder files to put hal and file deps in the same place.\nreorder graphics packages and variable to prepare mesa support.\n\nChange-Id: I6cc7da9823a400dabadd819b6b8d5ab5670f0975\nSigned-off-by: Guillaume La Roque \u003cglaroque@baylibre.com\u003e\nSigned-off-by: Maxime Fournier \u003cmfournier@baylibre.com\u003e\n" }, { "commit": "13ab2acb298350251c8870dd5214e88e23978fcb", "tree": "4587f5b51031c19859d4225c5e700b46276813ad", "parents": [ "80cdbe679b8509dc99bba0f52d40d9a6f21f3735" ], "author": { "name": "Guillaume La Roque", "email": "glaroque@baylibre.com", "time": "Mon Dec 18 17:53:52 2023 +0100" }, "committer": { "name": "Maxime Fournier", "email": "mfournier@baylibre.com", "time": "Mon Dec 16 10:35:00 2024 +0100" }, "message": "yukawa: Move CEC interface to vintf_fragment\n\nCommit 97d6bb49dda2 (\"Remove CEC libraries from non-Android TV Builds\")\nremoved the HAL installation but did not update the device manifest.\n\nMove the CEC hal to a vintf fragment so that it only gets shipped\nwhen building yukawa in TV mode.\n\nFixes: 97d6bb49dda2 (\"Remove CEC libraries from non-Android TV Builds\")\nTest: manual\nChange-Id: Ib929c6c62cfec538d7e8bd9d946d44a88a3a3388\nSigned-off-by: Guillaume La Roque \u003cglaroque@baylibre.com\u003e\nSigned-off-by: Maxime Fournier \u003cmfournier@baylibre.com\u003e\n" }, { "commit": "80cdbe679b8509dc99bba0f52d40d9a6f21f3735", "tree": "8b6232a145726d04942c026cafd322fd3e9d7dc1", "parents": [ "11cc885393e8e9077e0dd6ce1f32f27e5e7c3867" ], "author": { "name": "Guillaume La Roque", "email": "glaroque@baylibre.com", "time": "Fri Nov 03 12:26:49 2023 +0100" }, "committer": { "name": "Maxime Fournier", "email": "mfournier@baylibre.com", "time": "Fri Dec 13 14:02:58 2024 +0100" }, "message": "yukawa: Clean up and rework\n\n- Remove deprecated platform : sei510 and sei610\n- Remove 32bits only support\n- Drop legacy (non A/B) support\n- Support kernel 6.1 only to prepare full GKI support\n- Cosmetic rework\n- Use Broadcom upstream driver with new firmware shipped with vendor\n package\n- Use Codec2 instead of OMX service\n- Remove deprecated HAL and move on generic implementation when it\u0027s\n possible\n- Fix factory reset\n- Fix Black UI when we boot Android TV variant.\n\nThis commit is to prepare more important update to move on last Shipping\napi and manifest level and so support of last requirements of Android.\n\nChange-Id: I949993976a5111f4649b80ac30a60d794c857fc9\nSigned-off-by: Guillaume La Roque \u003cglaroque@baylibre.com\u003e\nSigned-off-by: Maxime Fournier \u003cmfournier@baylibre.com\u003e\n" }, { "commit": "4b7f360039ea063352050d8f4d58ca0a17f700d4", "tree": "f8f7e7a5fcb98e75eb9149544fe6cdd67d62c801", "parents": [ "75a3fb5229b466ea1734f132bc4412a77726f171", "11cc885393e8e9077e0dd6ce1f32f27e5e7c3867" ], "author": { "name": "Maxime Fournier", "email": "mfournier@baylibre.com", "time": "Wed Dec 04 01:14:01 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Dec 04 01:14:01 2024 +0000" }, "message": "yukawa: enable vendor package support am: 2a75ccbd85 am: 11cc885393\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3386522\n\nChange-Id: I2ace74ab9e102b4eff0987f07eab72fd55fcffae\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "11cc885393e8e9077e0dd6ce1f32f27e5e7c3867", "tree": "f8f7e7a5fcb98e75eb9149544fe6cdd67d62c801", "parents": [ "c3483b0f5449754b2bfe40a940bfad5a81538c59", "2a75ccbd8555382f6fcf47315cb9d2fb72afaf7e" ], "author": { "name": "Maxime Fournier", "email": "mfournier@baylibre.com", "time": "Wed Dec 04 00:50:20 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Dec 04 00:50:20 2024 +0000" }, "message": "yukawa: enable vendor package support am: 2a75ccbd85\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3386522\n\nChange-Id: Iacaba8d8e90ebd77362f6a86badb9e8fc5900ed8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2a75ccbd8555382f6fcf47315cb9d2fb72afaf7e", "tree": "f8f7e7a5fcb98e75eb9149544fe6cdd67d62c801", "parents": [ "933833ce49bc95936f79b10a8788e9a59d7f94b1" ], "author": { "name": "Maxime Fournier", "email": "mfournier@baylibre.com", "time": "Thu Nov 07 16:24:37 2024 +0100" }, "committer": { "name": "Maxime Fournier", "email": "mfournier@baylibre.com", "time": "Tue Dec 03 14:59:17 2024 +0100" }, "message": "yukawa: enable vendor package support\n\nRemove all binaries that are shipped with the vendor package.\nUpdate device-common.mk to include the binaries from the vendor package.\nAdd sanity checks for the vendor package version and issue warnings if\nthe vendor package is missing or its version is incorrect.\n\nThis is based on dragonboard\u0027s vendor package [1]\n\n[1] https://android-review.googlesource.com/c/device/linaro/dragonboard/+/1962360\nChange-Id: Ie39c88c03102b07e281e60d8a84fa78a35447ae2\nSigned-off-by: Maxime Fournier \u003cmfournier@baylibre.com\u003e\n" }, { "commit": "75a3fb5229b466ea1734f132bc4412a77726f171", "tree": "51553bba51cff35f72381080ff145cb7dcb6835a", "parents": [ "e39b8f553db7a0326651ae100cb5bdfaf1b42225", "c3483b0f5449754b2bfe40a940bfad5a81538c59" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Nov 19 23:31:26 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 19 23:31:26 2024 +0000" }, "message": "Merge \"Remove CEC libraries from non-Android TV Builds\" into main am: 933833ce49 am: c3483b0f54\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3342471\n\nChange-Id: I4c3fc96b7e904f226e0331474b0373fe0a5f9311\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c3483b0f5449754b2bfe40a940bfad5a81538c59", "tree": "51553bba51cff35f72381080ff145cb7dcb6835a", "parents": [ "10f1290a9739f076c527e7e5b4d2d8d2200193a2", "933833ce49bc95936f79b10a8788e9a59d7f94b1" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Nov 19 22:58:31 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 19 22:58:31 2024 +0000" }, "message": "Merge \"Remove CEC libraries from non-Android TV Builds\" into main am: 933833ce49\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3342471\n\nChange-Id: Ic9c491c8820cc25546248674c3a93941db292526\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "933833ce49bc95936f79b10a8788e9a59d7f94b1", "tree": "51553bba51cff35f72381080ff145cb7dcb6835a", "parents": [ "1642e38751bd13dcbbfebc19f82098fac5683835", "97d6bb49dda2ef97b4aac8f06f883a86461f28a7" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Nov 19 22:33:45 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Nov 19 22:33:45 2024 +0000" }, "message": "Merge \"Remove CEC libraries from non-Android TV Builds\" into main" }, { "commit": "e39b8f553db7a0326651ae100cb5bdfaf1b42225", "tree": "9587ad8bd82b074522e73e45784bc9c1cf245118", "parents": [ "44f3b7dbea0daa143959f38649dac735f40f30ab", "10f1290a9739f076c527e7e5b4d2d8d2200193a2" ], "author": { "name": "Priyanka Advani (xWF)", "email": "padvani@google.com", "time": "Mon Nov 18 23:32:02 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 18 23:32:02 2024 +0000" }, "message": "Merge \"Revert \"yukawa: enable vendor package support\"\" into main am: 1642e38751 am: 10f1290a97\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3361493\n\nChange-Id: I04d1c6a44b55dbb4f38df18b22ed316227ad246e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "10f1290a9739f076c527e7e5b4d2d8d2200193a2", "tree": "9587ad8bd82b074522e73e45784bc9c1cf245118", "parents": [ "117d6efb839dcc45b145aebf84ce5f8b2ffeee58", "1642e38751bd13dcbbfebc19f82098fac5683835" ], "author": { "name": "Priyanka Advani (xWF)", "email": "padvani@google.com", "time": "Mon Nov 18 23:08:28 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 18 23:08:28 2024 +0000" }, "message": "Merge \"Revert \"yukawa: enable vendor package support\"\" into main am: 1642e38751\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3361493\n\nChange-Id: Ib0f50e973a48b63d14f994626ff8eb8ab76b1393\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1642e38751bd13dcbbfebc19f82098fac5683835", "tree": "9587ad8bd82b074522e73e45784bc9c1cf245118", "parents": [ "dc548ba400a7a4c95f47e851c55bf989f8098c9e", "e52e15bbdef1d94ea819a43e83ef7c25b0de2449" ], "author": { "name": "Priyanka Advani (xWF)", "email": "padvani@google.com", "time": "Mon Nov 18 22:44:25 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Nov 18 22:44:25 2024 +0000" }, "message": "Merge \"Revert \"yukawa: enable vendor package support\"\" into main" }, { "commit": "e52e15bbdef1d94ea819a43e83ef7c25b0de2449", "tree": "9587ad8bd82b074522e73e45784bc9c1cf245118", "parents": [ "ff5ec962ad13eea2bd0f615792fdfc814e96175c" ], "author": { "name": "Priyanka Advani (xWF)", "email": "padvani@google.com", "time": "Mon Nov 18 21:11:35 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Nov 18 21:11:35 2024 +0000" }, "message": "Revert \"yukawa: enable vendor package support\"\n\nThis reverts commit ff5ec962ad13eea2bd0f615792fdfc814e96175c.\n\nReason for revert: Droidmonitor created revert due to b/379721021. Will be verifying through ABTD before submission.\n\nChange-Id: I62c1bd191b709b9ff79dad45fb4f58f2bdc8db5a\n" }, { "commit": "44f3b7dbea0daa143959f38649dac735f40f30ab", "tree": "2222dc58cc446236fe6c91f5eda4c973edf54776", "parents": [ "6a5007d44fd270f05fe1da2ab42f8007da4c097b", "117d6efb839dcc45b145aebf84ce5f8b2ffeee58" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Nov 18 20:13:11 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 18 20:13:11 2024 +0000" }, "message": "Merge \"yukawa: enable vendor package support\" into main am: dc548ba400 am: 117d6efb83\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3350854\n\nChange-Id: I6cf42bfbcfef1b57ea9e02934a99946e5a65bc23\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6a5007d44fd270f05fe1da2ab42f8007da4c097b", "tree": "9587ad8bd82b074522e73e45784bc9c1cf245118", "parents": [ "0239bcc5960015a0992f7cade9966798e6fe9892", "52bda9b3eb3f8af6aa97c323eae3d5bf29066a50" ], "author": { "name": "Maxime Fournier", "email": "mfournier@baylibre.com", "time": "Mon Nov 18 20:11:20 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 18 20:11:20 2024 +0000" }, "message": "yukawa: ship vendor package fetch script am: 14c96ba6c1 am: 52bda9b3eb\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3350853\n\nChange-Id: I7ff1b062d41dde1f3aff2985949e3b23e0344f73\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "117d6efb839dcc45b145aebf84ce5f8b2ffeee58", "tree": "2222dc58cc446236fe6c91f5eda4c973edf54776", "parents": [ "52bda9b3eb3f8af6aa97c323eae3d5bf29066a50", "dc548ba400a7a4c95f47e851c55bf989f8098c9e" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Nov 18 19:24:32 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 18 19:24:32 2024 +0000" }, "message": "Merge \"yukawa: enable vendor package support\" into main am: dc548ba400\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3350854\n\nChange-Id: I03741e0883095f64d423f3de86bf96de2f69d80d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "52bda9b3eb3f8af6aa97c323eae3d5bf29066a50", "tree": "9587ad8bd82b074522e73e45784bc9c1cf245118", "parents": [ "d1fefe5e63047e077de95f545048a4b744ffea68", "14c96ba6c13c695d62b85772226e375ba39eb139" ], "author": { "name": "Maxime Fournier", "email": "mfournier@baylibre.com", "time": "Mon Nov 18 19:23:40 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 18 19:23:40 2024 +0000" }, "message": "yukawa: ship vendor package fetch script am: 14c96ba6c1\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3350853\n\nChange-Id: Ia10a0a1d9ba68de156e9baf4ec81d0bb9489856b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "dc548ba400a7a4c95f47e851c55bf989f8098c9e", "tree": "2222dc58cc446236fe6c91f5eda4c973edf54776", "parents": [ "14c96ba6c13c695d62b85772226e375ba39eb139", "ff5ec962ad13eea2bd0f615792fdfc814e96175c" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Nov 18 18:56:30 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Nov 18 18:56:30 2024 +0000" }, "message": "Merge \"yukawa: enable vendor package support\" into main" }, { "commit": "ff5ec962ad13eea2bd0f615792fdfc814e96175c", "tree": "2222dc58cc446236fe6c91f5eda4c973edf54776", "parents": [ "14c96ba6c13c695d62b85772226e375ba39eb139" ], "author": { "name": "Maxime Fournier", "email": "mfournier@baylibre.com", "time": "Thu Nov 07 16:24:37 2024 +0100" }, "committer": { "name": "Maxime Fournier", "email": "mfournier@baylibre.com", "time": "Fri Nov 15 11:16:33 2024 +0100" }, "message": "yukawa: enable vendor package support\n\nRemove all binaries that are shipped with the vendor package.\nUpdate device-common.mk to include the binaries from the vendor package.\nAdd sanity checks for the vendor package version and issue warnings if\nthe vendor package is missing or its version is incorrect.\n\nThis is based on dragonboard\u0027s vendor package [1]\n\n[1] https://android-review.googlesource.com/c/device/linaro/dragonboard/+/1962360\nChange-Id: I70f659b3f080db875e5b617486adcd2275d91a49\nSigned-off-by: Maxime Fournier \u003cmfournier@baylibre.com\u003e\n" }, { "commit": "14c96ba6c13c695d62b85772226e375ba39eb139", "tree": "9587ad8bd82b074522e73e45784bc9c1cf245118", "parents": [ "879c99c46fca7fe6a02a9eebe2aea480a687e4b6" ], "author": { "name": "Maxime Fournier", "email": "mfournier@baylibre.com", "time": "Thu Nov 07 19:23:35 2024 +0100" }, "committer": { "name": "Maxime Fournier", "email": "mfournier@baylibre.com", "time": "Fri Nov 15 11:16:08 2024 +0100" }, "message": "yukawa: ship vendor package fetch script\n\nProvide helper script to fetch the vendor package.\n\nthe following variables need to match upstream vendor package.\n- EXPECTED_VENDOR_VERSION\n- EXPECTED_VENDOR_SHA\n\nThis is based on dragonboard\u0027s vendor package [1]\n\n[1] https://android-review.googlesource.com/c/device/linaro/dragonboard/+/1962360\nChange-Id: Ibc347e918d1f967cdda53c5547abb018d6da3ab1\nSigned-off-by: Maxime Fournier \u003cmfournier@baylibre.com\u003e\n" }, { "commit": "97d6bb49dda2ef97b4aac8f06f883a86461f28a7", "tree": "6b532e17d73df000fb95db1414b05ed98d2209bc", "parents": [ "879c99c46fca7fe6a02a9eebe2aea480a687e4b6" ], "author": { "name": "Al Sutton", "email": "al.sutton@alsutton.com", "time": "Tue Nov 12 13:35:15 2024 +0000" }, "committer": { "name": "Al Sutton", "email": "al.sutton@alsutton.com", "time": "Tue Nov 12 13:54:02 2024 +0000" }, "message": "Remove CEC libraries from non-Android TV Builds\n\nHaving the CEC implementation in a non-ATV build can sometimes lead\nto issues. One example is the CEC failing to initialise on tablet builds\nwith the following error;\n\n...\n2680 2680 E System : Caused by: java.lang.IllegalArgumentException: address should be positive.\n2680 2680 E System : at android.hardware.hdmi.HdmiPortInfo$Builder.\u003cinit\u003e(HdmiPortInfo.java:276)\n2680 2680 E System : at com.android.server.hdmi.HdmiCecController$NativeWrapperImpl.nativeGetPortInfos(HdmiCecController.java:1496)\n...\n\nTo address this, where the build is not a ATV build (i.e. when\nPRODUCT_IS_ATV is not set to `true`), the CEC libraries are\nnot included in the build, and thus the final firmware.\n\nTest: Build ATV and Tablet builds, check for presence of CEC libs;\n\n$ lunch yukawa-trunk_staging-userdebug\n$ m\n$ find out/target/product/yukawa/vendor | grep cec\nout/target/product/yukawa/vendor/lib/hw/hdmi_cec.yukawa.so\nout/target/product/yukawa/vendor/lib/hw/android.hardware.tv.cec@1.0-impl.so\nout/target/product/yukawa/vendor/lib/android.hardware.tv.cec@1.0.so\nout/target/product/yukawa/vendor/lib64/hw/hdmi_cec.yukawa.so\nout/target/product/yukawa/vendor/lib64/hw/android.hardware.tv.cec@1.0-impl.so\nout/target/product/yukawa/vendor/lib64/android.hardware.tv.cec@1.0.so\nout/target/product/yukawa/vendor/etc/init/android.hardware.tv.cec@1.0-service.rc\nout/target/product/yukawa/vendor/bin/hw/android.hardware.tv.cec@1.0-service\n$ m TARGET_USE_TABLET_LAUNCHER\u003dtrue\n$ find out/target/product/yukawa/vendor | grep cec\n$\n\n\nChange-Id: I44af3c52a5d6a111ade833af51267c1fd77c6e0f\nSigned-off-by: Al Sutton \u003cal.sutton@alsutton.com\u003e\n" }, { "commit": "0239bcc5960015a0992f7cade9966798e6fe9892", "tree": "e1f6f4cb2b3e43b6306d61fd83c10272db74b33b", "parents": [ "92a08b287cb04728320d64459cbe64081ca726e6", "d1fefe5e63047e077de95f545048a4b744ffea68" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Oct 19 07:37:30 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Oct 19 07:37:30 2024 +0000" }, "message": "[automerger skipped] Mark 24Q4 as merged in aosp-main-future am: d1fefe5e63 -s ours\n\nam skip reason: Merged-In Ia10d5859deb8ede6018d632e18fe6d54b70bc1b5 with SHA-1 92a08b287c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/device/amlogic/yukawa/+/29935180\n\nChange-Id: I8dfac0d4a2765cadfab9424dbc5764685d7f1305\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d1fefe5e63047e077de95f545048a4b744ffea68", "tree": "e1f6f4cb2b3e43b6306d61fd83c10272db74b33b", "parents": [ "38ad0452034ae6c1b3ab707f3fcc215c936b751c", "79b224282452899e960acaafd1006d073a5909e7" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 17 11:03:23 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 17 11:03:23 2024 -0700" }, "message": "Mark 24Q4 as merged in aosp-main-future\n\nBug: 373937381\nMerged-In: Ia10d5859deb8ede6018d632e18fe6d54b70bc1b5\nChange-Id: Icd83ef64e37ec6332c81e3839ba9966eedd49441\n" }, { "commit": "92a08b287cb04728320d64459cbe64081ca726e6", "tree": "e1f6f4cb2b3e43b6306d61fd83c10272db74b33b", "parents": [ "ae422d0e7b0ad60d842ed1a65052c382574e6466", "38ad0452034ae6c1b3ab707f3fcc215c936b751c" ], "author": { "name": "Mattijs Korpershoek", "email": "mkorpershoek@baylibre.com", "time": "Mon Oct 07 18:19:50 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 07 18:19:50 2024 +0000" }, "message": "yukawa: Add --ramdisk_offset to BOARD_MKBOOTIMG_ARGS am: 879c99c46f am: 38ad045203\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3290364\n\nChange-Id: Ia10d5859deb8ede6018d632e18fe6d54b70bc1b5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "38ad0452034ae6c1b3ab707f3fcc215c936b751c", "tree": "e1f6f4cb2b3e43b6306d61fd83c10272db74b33b", "parents": [ "3af4fddb8b6e29814be116d606ea21ff7721a99d", "879c99c46fca7fe6a02a9eebe2aea480a687e4b6" ], "author": { "name": "Mattijs Korpershoek", "email": "mkorpershoek@baylibre.com", "time": "Mon Oct 07 17:55:23 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 07 17:55:23 2024 +0000" }, "message": "yukawa: Add --ramdisk_offset to BOARD_MKBOOTIMG_ARGS am: 879c99c46f\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3290364\n\nChange-Id: I360d8cf0bcfe272763514d4261c07194605a28e8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "879c99c46fca7fe6a02a9eebe2aea480a687e4b6", "tree": "e1f6f4cb2b3e43b6306d61fd83c10272db74b33b", "parents": [ "b781a0806b2c8a84450c31003cecd1b8662d1112" ], "author": { "name": "Mattijs Korpershoek", "email": "mkorpershoek@baylibre.com", "time": "Thu Oct 03 14:54:51 2024 +0200" }, "committer": { "name": "Mattijs Korpershoek", "email": "mkorpershoek@baylibre.com", "time": "Thu Oct 03 15:22:16 2024 +0200" }, "message": "yukawa: Add --ramdisk_offset to BOARD_MKBOOTIMG_ARGS\n\nWhen building boot.img using mkbootimg, we use the default ramdisk\noffset of 0x1000000.\n\nThe boot.img information has as following:\n0x11000000 ramdisk start\n0x11080000 kernel start\n\nSince the ramdisk is bigger than 512 KiB (0x00080000), there\nis clearly an overlap between the kernel and the ramdisk.\n\nThis happened to work all right because U-Boot was ignoring the\nramdisk offset from the boot.img header.\nHowever, a recent patch fixed this in U-Boot [1]. That fix was\nincomplete for boot image v2 and has been completed with [2].\n\nBecause of the 2 fixes, boot is now broken on Yukawa because the ramdisk\ngets overwritten by the kernel.\n\nChange the ramdisk location by providing a --ramdisk_offset to mkbootimg.\n\n[1] https://lore.kernel.org/r/all/20240519130951.2558467-1-r.stratiienko@gmail.com/\n[2] https://lore.kernel.org/r/all/20241003-android-fix-boot-v2-v1-1-13e8e44af4b7@baylibre.com/\nChange-Id: I59369dc2cea1e9e7a0227fa94841b806fb332b34\nSigned-off-by: Mattijs Korpershoek \u003cmkorpershoek@baylibre.com\u003e\n" }, { "commit": "ae422d0e7b0ad60d842ed1a65052c382574e6466", "tree": "087cbb8f1026439014bbda5878f594abc462e42a", "parents": [ "e6b851f9883b435294314b6b2fda49338a0cde16", "3af4fddb8b6e29814be116d606ea21ff7721a99d" ], "author": { "name": "Mattijs Korpershoek", "email": "mkorpershoek@baylibre.com", "time": "Mon Sep 30 19:08:46 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 30 19:08:46 2024 +0000" }, "message": "yukawa: Set BOARD_INCLUDE_RECOVERY_DTBO :\u003d true to fix build break am: b781a0806b am: 3af4fddb8b\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3287214\n\nChange-Id: Ib2a122f68f8e0547a05b012914499aca64702d7c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3af4fddb8b6e29814be116d606ea21ff7721a99d", "tree": "087cbb8f1026439014bbda5878f594abc462e42a", "parents": [ "8f2ad66d1e9e747504d24a1bd2f9930c128dc005", "b781a0806b2c8a84450c31003cecd1b8662d1112" ], "author": { "name": "Mattijs Korpershoek", "email": "mkorpershoek@baylibre.com", "time": "Mon Sep 30 18:53:02 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 30 18:53:02 2024 +0000" }, "message": "yukawa: Set BOARD_INCLUDE_RECOVERY_DTBO :\u003d true to fix build break am: b781a0806b\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3287214\n\nChange-Id: I8a0de41f7ba82a1f98180f4ab919c67cebe76ee3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b781a0806b2c8a84450c31003cecd1b8662d1112", "tree": "087cbb8f1026439014bbda5878f594abc462e42a", "parents": [ "0cfc261cecfa6b586d872434100d01039c8bf610" ], "author": { "name": "Mattijs Korpershoek", "email": "mkorpershoek@baylibre.com", "time": "Mon Sep 30 13:40:38 2024 +0200" }, "committer": { "name": "Mattijs Korpershoek", "email": "mkorpershoek@baylibre.com", "time": "Mon Sep 30 13:52:17 2024 +0200" }, "message": "yukawa: Set BOARD_INCLUDE_RECOVERY_DTBO :\u003d true to fix build break\n\nWhen building yukawa, we can see:\n\nFAILED: ninja: \u0027out/host/linux-x86/bin/imgdiff\u0027, needed by\n\u0027out/target/product/yukawa/obj/PACKAGING/recovery_patch_intermediates/recovery_from_boot.p\u0027,\nmissing and no known rule to make it\n11:48:53 ninja failed with: exit status 1\n\nimgdiff has been removed from Android [1], however it\u0027s still\nmentioned as diff_tool in build/make/core/Makefile.\n\nIt\u0027s only used when BOARD_INCLUDE_RECOVERY_DTBO is not set.\nWhen it\u0027s set, we use bsdiff instead.\n\nSince we are non A/B on Yukawa, we *must* set\nBOARD_INCLUDE_RECOVERY_DTBO :\u003d true according to [2]\n\nSet it to true fixes the build issue.\n\n[1] https://android-review.googlesource.com/c/platform/bootable/recovery/+/2962986\n[2] https://source.android.com/docs/core/architecture/bootloader/recovery-images#dtbo-implementation\nTest: m\nChange-Id: Icd8b818f37a23dcec5d1487b97697e1f054c55fe\nSigned-off-by: Mattijs Korpershoek \u003cmkorpershoek@baylibre.com\u003e\n" }, { "commit": "e6b851f9883b435294314b6b2fda49338a0cde16", "tree": "9635c0da85e4354302e359d87927554cac69c8aa", "parents": [ "be0383b7e06da7b8fdb23c1ec251108031cef79c", "8f2ad66d1e9e747504d24a1bd2f9930c128dc005" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Sep 26 19:10:25 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Sep 26 19:10:25 2024 +0000" }, "message": "Merge \"CEC: fix use-after-free in hdmicec_close\" into main am: 0cfc261cec am: 8f2ad66d1e\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3270712\n\nChange-Id: I2dff621b4e0f49c8512af3c04041f72184feb7df\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8f2ad66d1e9e747504d24a1bd2f9930c128dc005", "tree": "9635c0da85e4354302e359d87927554cac69c8aa", "parents": [ "e0979212eb869bc109720d840c8a6c2ece141091", "0cfc261cecfa6b586d872434100d01039c8bf610" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Sep 26 18:32:02 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Sep 26 18:32:02 2024 +0000" }, "message": "Merge \"CEC: fix use-after-free in hdmicec_close\" into main am: 0cfc261cec\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3270712\n\nChange-Id: Iaffe331076a67bd50ec694ccc27bd4ad20e371d4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0cfc261cecfa6b586d872434100d01039c8bf610", "tree": "9635c0da85e4354302e359d87927554cac69c8aa", "parents": [ "3fb07d7315d2b506a2946dac194710b672c10a33", "e35269110e7e4df5061ba8078d95893ae5d6e777" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Sep 26 18:11:35 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Sep 26 18:11:35 2024 +0000" }, "message": "Merge \"CEC: fix use-after-free in hdmicec_close\" into main" }, { "commit": "be0383b7e06da7b8fdb23c1ec251108031cef79c", "tree": "2bfb3e5f42efad75cbeed16498ff1f8a08e95048", "parents": [ "79b224282452899e960acaafd1006d073a5909e7", "e0979212eb869bc109720d840c8a6c2ece141091" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Sep 26 18:10:25 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Sep 26 18:10:25 2024 +0000" }, "message": "Merge \"CEC: do not join NULL thread\" into main am: 3fb07d7315 am: e0979212eb\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3270711\n\nChange-Id: I4756a991fdafe90bbdb965ee83af72134a8820f9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e0979212eb869bc109720d840c8a6c2ece141091", "tree": "2bfb3e5f42efad75cbeed16498ff1f8a08e95048", "parents": [ "4fe49da8f9e150d1327b6705f66a536d782b86de", "3fb07d7315d2b506a2946dac194710b672c10a33" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Sep 26 17:47:16 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Sep 26 17:47:16 2024 +0000" }, "message": "Merge \"CEC: do not join NULL thread\" into main am: 3fb07d7315\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3270711\n\nChange-Id: Ia4a825e353f08898731b478d0fe4d607c7ad7802\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3fb07d7315d2b506a2946dac194710b672c10a33", "tree": "2bfb3e5f42efad75cbeed16498ff1f8a08e95048", "parents": [ "dd15d4b219c0a98e771fdbc272b4244bc163af2d", "f156fcad8ac3f26e02cdd1c507583a0e823c3b01" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Sep 26 16:54:11 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Sep 26 16:54:11 2024 +0000" }, "message": "Merge \"CEC: do not join NULL thread\" into main" }, { "commit": "79b224282452899e960acaafd1006d073a5909e7", "tree": "7cba10604e46d9d126c285b8412bc7449bbaa46e", "parents": [ "220bd1597e283599dfc218ec79aae6b71718fca4", "4fe49da8f9e150d1327b6705f66a536d782b86de" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Tue Sep 24 00:19:39 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 24 00:19:39 2024 +0000" }, "message": "Delete old Make variables for Yukawa board. am: dd15d4b219 am: 4fe49da8f9\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3260134\n\nChange-Id: I2cb433249edec6b4a3d5e38a28851b15cbc2a75d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4fe49da8f9e150d1327b6705f66a536d782b86de", "tree": "7cba10604e46d9d126c285b8412bc7449bbaa46e", "parents": [ "3f7de6f8b9fd0342b48666de35451c41344e4312", "dd15d4b219c0a98e771fdbc272b4244bc163af2d" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Mon Sep 23 23:59:42 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 23 23:59:42 2024 +0000" }, "message": "Delete old Make variables for Yukawa board. am: dd15d4b219\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3260134\n\nChange-Id: I1c072f3b14842950c4910a71fcc022394a0079d6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "dd15d4b219c0a98e771fdbc272b4244bc163af2d", "tree": "7cba10604e46d9d126c285b8412bc7449bbaa46e", "parents": [ "3f7de6f8b9fd0342b48666de35451c41344e4312" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Mon Sep 09 20:55:18 2024 +0000" }, "committer": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Mon Sep 23 22:12:38 2024 +0000" }, "message": "Delete old Make variables for Yukawa board.\n\n- Setting PRODUCT_FULL_TREBLE_OVERRIDE to true doesn\u0027t do\n anything when PRODUCT_SHIPPING_API_LEVEL is 26 or higher,\n and it is set to 31 in yukawa-common.mk.\n- Setting BOARD_VNDK_VERSION to \"current\" also doesn\u0027t do\n anything, because it\u0027s identical to the default setting.\n\nBug: 307369186\nTest: presubmit\nFlag: EXEMPT trivial build cleanup\nChange-Id: Ice0c18095cfb43d0fa9d60c5aed51af0af741fbd\n" }, { "commit": "e35269110e7e4df5061ba8078d95893ae5d6e777", "tree": "4e4c118664d1f750f7d43952b16b83d1aeddce98", "parents": [ "f156fcad8ac3f26e02cdd1c507583a0e823c3b01" ], "author": { "name": "Oleg Lyovin", "email": "ovlevin@salutedevices.com", "time": "Tue Sep 17 15:33:21 2024 +0300" }, "committer": { "name": "Oleg Lyovin", "email": "ovlevin@salutedevices.com", "time": "Tue Sep 17 15:33:21 2024 +0300" }, "message": "CEC: fix use-after-free in hdmicec_close\n\nFields of \u0027ctx\u0027 are accessed just after it is freed.\n\nTest: manual\nChange-Id: I7c3786db9ae618d84149874c72662e4d105765b4\nSigned-off-by: Oleg Lyovin \u003covlevin@salutedevices.com\u003e\n" }, { "commit": "f156fcad8ac3f26e02cdd1c507583a0e823c3b01", "tree": "6e809e87565bfe39976f2580448d80d473204cc4", "parents": [ "3f7de6f8b9fd0342b48666de35451c41344e4312" ], "author": { "name": "Oleg Lyovin", "email": "ovlevin@salutedevices.com", "time": "Tue Sep 17 15:31:30 2024 +0300" }, "committer": { "name": "Oleg Lyovin", "email": "ovlevin@salutedevices.com", "time": "Tue Sep 17 15:31:30 2024 +0300" }, "message": "CEC: do not join NULL thread\n\n\u0027hdmicec_close\u0027 may be called after exit_fd initialized,\nbut before ctx-\u003ethread created.\n\nThis patch checks it for NULL before join.\n\nTest: manual\nChange-Id: I1c57be56f2cd9956044d9a48fea914b1c1fd0132\nSigned-off-by: Oleg Lyovin \u003covlevin@salutedevices.com\u003e\n" }, { "commit": "220bd1597e283599dfc218ec79aae6b71718fca4", "tree": "a6aecae8fc4083101782552735356a1d1c2203c6", "parents": [ "d955c33bb352fd827c99db494b824ac15eda30c8", "3f7de6f8b9fd0342b48666de35451c41344e4312" ], "author": { "name": "Kelvin Zhang", "email": "zhangkelvin@google.com", "time": "Wed Jun 26 18:10:32 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 26 18:10:32 2024 +0000" }, "message": "Explicitly set yukawa as an non-AB target am: 2318974a95 am: 3f7de6f8b9\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3147481\n\nChange-Id: I8bd05b205a430e43e13c5a339098d425bbec490f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3f7de6f8b9fd0342b48666de35451c41344e4312", "tree": "a6aecae8fc4083101782552735356a1d1c2203c6", "parents": [ "d955c33bb352fd827c99db494b824ac15eda30c8", "2318974a95c2c43d85fb7cbfbf7450a633c235b5" ], "author": { "name": "Kelvin Zhang", "email": "zhangkelvin@google.com", "time": "Wed Jun 26 17:51:35 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 26 17:51:35 2024 +0000" }, "message": "Explicitly set yukawa as an non-AB target am: 2318974a95\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3147481\n\nChange-Id: Idc6f63b39ff65ae39efb3cc04e0f64183d8fc000\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2318974a95c2c43d85fb7cbfbf7450a633c235b5", "tree": "a6aecae8fc4083101782552735356a1d1c2203c6", "parents": [ "aa8dd57c248019378388008f16ee011450cd5f45" ], "author": { "name": "Kelvin Zhang", "email": "zhangkelvin@google.com", "time": "Tue Jun 25 16:57:21 2024 -0700" }, "committer": { "name": "Kelvin Zhang", "email": "zhangkelvin@google.com", "time": "Tue Jun 25 17:00:43 2024 -0700" }, "message": "Explicitly set yukawa as an non-AB target\n\nWe will be changing AB to be the default, existing non-AB targets\nneed to explicitly set AB_OTA_UPDATER to false\n\nTest: th\nChange-Id: I86a76296937a6abab1b4495cd66a35144348aafd\n" }, { "commit": "d955c33bb352fd827c99db494b824ac15eda30c8", "tree": "1c15c1db8f085e9a5b0ff4b077abbb5d6982849c", "parents": [ "0a75781d4378eece7b7dfe5183d9959c3b6ae83c", "aa8dd57c248019378388008f16ee011450cd5f45" ], "author": { "name": "Kelvin Zhang", "email": "zhangkelvin@google.com", "time": "Tue May 28 17:54:20 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 28 17:54:20 2024 +0000" }, "message": "Allor yukawa to access bootable/deprecated-ota targets am: 03de277177 am: aa8dd57c24\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3106617\n\nChange-Id: I774427707cd2a77973f6e0b1ab964fe7b54e91db\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "aa8dd57c248019378388008f16ee011450cd5f45", "tree": "1c15c1db8f085e9a5b0ff4b077abbb5d6982849c", "parents": [ "2fa5477353f68ef84a23c2fabc54bdd9d72787b4", "03de2771770239e5dff804a34c00727be853c4c8" ], "author": { "name": "Kelvin Zhang", "email": "zhangkelvin@google.com", "time": "Tue May 28 17:38:32 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 28 17:38:32 2024 +0000" }, "message": "Allor yukawa to access bootable/deprecated-ota targets am: 03de277177\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3106617\n\nChange-Id: Ic09fc63d4a50ef294a77c3a4f7cdd201d500f906\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "03de2771770239e5dff804a34c00727be853c4c8", "tree": "1c15c1db8f085e9a5b0ff4b077abbb5d6982849c", "parents": [ "a146e93ab5506c1932fe33ed1849c745ec4f275a" ], "author": { "name": "Kelvin Zhang", "email": "zhangkelvin@google.com", "time": "Tue May 28 09:19:54 2024 -0700" }, "committer": { "name": "Kelvin Zhang", "email": "zhangkelvin@google.com", "time": "Tue May 28 09:28:53 2024 -0700" }, "message": "Allor yukawa to access bootable/deprecated-ota targets\n\nYukawa is still using non-AB update.\nnon-AB code will be moved to a separated namespace, add\ndeprecated-ota to yukawa\u0027s namespace list ahead of time to avoid\nbreaakage.\n\nTest: th\nBug: 324360816\nChange-Id: I909064be36e8febe80492cf010eb6eac3d6bc33d\n" }, { "commit": "0a75781d4378eece7b7dfe5183d9959c3b6ae83c", "tree": "cdbb2fa2ccbf6cd5db2c91a4a89eb6f042abcebc", "parents": [ "4720c9a23c9bb1a899210da84b861b348d105fad", "2fa5477353f68ef84a23c2fabc54bdd9d72787b4" ], "author": { "name": "Henri Chataing", "email": "henrichataing@google.com", "time": "Fri Mar 22 21:38:01 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Mar 22 21:38:01 2024 +0000" }, "message": "Use default bluetooth aidl hal implementation am: a146e93ab5 am: 2fa5477353\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3008279\n\nChange-Id: I600ae52ab40840e655bc9ca1dd7ad228a972f088\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2fa5477353f68ef84a23c2fabc54bdd9d72787b4", "tree": "cdbb2fa2ccbf6cd5db2c91a4a89eb6f042abcebc", "parents": [ "4720c9a23c9bb1a899210da84b861b348d105fad", "a146e93ab5506c1932fe33ed1849c745ec4f275a" ], "author": { "name": "Henri Chataing", "email": "henrichataing@google.com", "time": "Fri Mar 22 21:08:52 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Mar 22 21:08:52 2024 +0000" }, "message": "Use default bluetooth aidl hal implementation am: a146e93ab5\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/3008279\n\nChange-Id: Ie441a5c028d41283479f4b51d743d0600cbd4aa4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a146e93ab5506c1932fe33ed1849c745ec4f275a", "tree": "cdbb2fa2ccbf6cd5db2c91a4a89eb6f042abcebc", "parents": [ "4720c9a23c9bb1a899210da84b861b348d105fad" ], "author": { "name": "Henri Chataing", "email": "henrichataing@google.com", "time": "Thu Mar 21 16:12:40 2024 +0000" }, "committer": { "name": "Henri Chataing", "email": "henrichataing@google.com", "time": "Thu Mar 21 16:25:37 2024 +0000" }, "message": "Use default bluetooth aidl hal implementation\n\nBug: 330725322\nTest: TreeHugger\nChange-Id: I186991859ee80fe60962bb3797b4d125795923f4\n" }, { "commit": "4720c9a23c9bb1a899210da84b861b348d105fad", "tree": "c2e8294c3a28aa7f52d052904bb546033257abf4", "parents": [ "555836b30bf40e40c2021f926f6fc130aee26821", "f0a632aaa35711896a1c670d7d62aa3d677ab6a3" ], "author": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Tue Oct 31 01:52:39 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 31 01:52:39 2023 +0000" }, "message": "[automerger skipped] Fix lunch choices for git_main am: 6b5c8c3fff am: 3f6bdceb94 -s ours am: f0a632aaa3 -s ours\n\nam skip reason: Merged-In I293119e6bb0e62d12b890899e7aa02dc12de7619 with SHA-1 6b5c8c3fff is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2811195\n\nChange-Id: I1a15b8dea806041ea129736471d80be92d383a21\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "555836b30bf40e40c2021f926f6fc130aee26821", "tree": "c2e8294c3a28aa7f52d052904bb546033257abf4", "parents": [ "f4d66514e8e6c05b2fe53d0f0c97eae5da0688d3", "56bed313a97420c11f07669de8e9bf6dc9a93c59" ], "author": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Tue Oct 31 01:50:27 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 31 01:50:27 2023 +0000" }, "message": "[automerger skipped] Fix lunch choices for git_main am: 6b5c8c3fff am: e04fa5872b am: 56bed313a9 -s ours\n\nam skip reason: Merged-In I293119e6bb0e62d12b890899e7aa02dc12de7619 with SHA-1 f4d66514e8 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2811195\n\nChange-Id: Ic1779fd43fa664f29a91a100003a65d93171d172\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f0a632aaa35711896a1c670d7d62aa3d677ab6a3", "tree": "c2e8294c3a28aa7f52d052904bb546033257abf4", "parents": [ "56bed313a97420c11f07669de8e9bf6dc9a93c59", "3f6bdceb94cca16506b8ee807267e1ca8760b447" ], "author": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Tue Oct 31 00:47:27 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 31 00:47:27 2023 +0000" }, "message": "[automerger skipped] Fix lunch choices for git_main am: 6b5c8c3fff am: 3f6bdceb94 -s ours\n\nam skip reason: Merged-In I293119e6bb0e62d12b890899e7aa02dc12de7619 with SHA-1 6b5c8c3fff is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2811195\n\nChange-Id: I8e5dbf7994441585916d989f491708100231b154\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "56bed313a97420c11f07669de8e9bf6dc9a93c59", "tree": "c2e8294c3a28aa7f52d052904bb546033257abf4", "parents": [ "f91b0fe2365272cb135c44b5eff3993e1a9c07f9", "e04fa5872bff0a37e311cff672a7da8cb58510d5" ], "author": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Tue Oct 31 00:39:34 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 31 00:39:34 2023 +0000" }, "message": "Fix lunch choices for git_main am: 6b5c8c3fff am: e04fa5872b\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2811195\n\nChange-Id: If583cdb60da0c5907a2c9c1d8dacca10f14cfc96\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3f6bdceb94cca16506b8ee807267e1ca8760b447", "tree": "c2e8294c3a28aa7f52d052904bb546033257abf4", "parents": [ "21c32402a615b63f764aa5c6fd419c8378b3ec74", "6b5c8c3fffba7bc94718c1e19122fcba460bc1bb" ], "author": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Mon Oct 30 23:43:06 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 30 23:43:06 2023 +0000" }, "message": "Fix lunch choices for git_main am: 6b5c8c3fff\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2811195\n\nChange-Id: If25635f525af5e3ac414e8d4a80b91ff5ddc2c47\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e04fa5872bff0a37e311cff672a7da8cb58510d5", "tree": "c2e8294c3a28aa7f52d052904bb546033257abf4", "parents": [ "f91b0fe2365272cb135c44b5eff3993e1a9c07f9", "6b5c8c3fffba7bc94718c1e19122fcba460bc1bb" ], "author": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Mon Oct 30 23:39:25 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 30 23:39:25 2023 +0000" }, "message": "Fix lunch choices for git_main am: 6b5c8c3fff\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2811195\n\nChange-Id: Ib4972c7597f36645de0ee1a325520d06633df2d7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6b5c8c3fffba7bc94718c1e19122fcba460bc1bb", "tree": "c2e8294c3a28aa7f52d052904bb546033257abf4", "parents": [ "92b51f2bbbab9f9b99ebf30dc102bb0b0f46a4bb" ], "author": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Mon Oct 30 22:10:29 2023 +0000" }, "committer": { "name": "Android Build Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Mon Oct 30 22:10:29 2023 +0000" }, "message": "Fix lunch choices for git_main\n\nWe add \"trunk_staging-\" for all COMMON_LUNCH_CHOICES so they are\nvalid in the trunk stable setup.\n\nBug: 307738446\nTest: lunch\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f4d66514e8e6c05b2fe53d0f0c97eae5da0688d3)\nMerged-In: I293119e6bb0e62d12b890899e7aa02dc12de7619\nChange-Id: I293119e6bb0e62d12b890899e7aa02dc12de7619\n" }, { "commit": "f4d66514e8e6c05b2fe53d0f0c97eae5da0688d3", "tree": "c2e8294c3a28aa7f52d052904bb546033257abf4", "parents": [ "038c0b25ad80bb73392fa0e42763718c96e3d94f" ], "author": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Wed Oct 25 16:51:18 2023 -0600" }, "committer": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Wed Oct 25 16:51:18 2023 -0600" }, "message": "Fix lunch choices for git_main\n\nWe add \"trunk_staging-\" for all COMMON_LUNCH_CHOICES so they are\nvalid in the trunk stable setup.\n\nBug: 307738446\nTest: lunch\nChange-Id: I293119e6bb0e62d12b890899e7aa02dc12de7619\n" }, { "commit": "038c0b25ad80bb73392fa0e42763718c96e3d94f", "tree": "517cfd7d80ac803069c8be1833ef5c340ad851d6", "parents": [ "4ebb729a3f4aa8e02b28a09c1b92510a9375ae44", "f91b0fe2365272cb135c44b5eff3993e1a9c07f9" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Fri Oct 13 23:20:10 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 13 23:20:10 2023 +0000" }, "message": "Use install_symlink to add symlinks am: 92b51f2bbb am: 9246129559 am: 21c32402a6 am: 43692db7bc am: f91b0fe236\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2786433\n\nChange-Id: I2f5ec30573f09ae5b9adf996103cf73964702f1a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f91b0fe2365272cb135c44b5eff3993e1a9c07f9", "tree": "517cfd7d80ac803069c8be1833ef5c340ad851d6", "parents": [ "fa258e01d7a55378cf38b6cddbc806204c4af6b6", "43692db7bcc3094f7a0699034eecfc5efabfe0c1" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Fri Oct 13 22:48:55 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 13 22:48:55 2023 +0000" }, "message": "Use install_symlink to add symlinks am: 92b51f2bbb am: 9246129559 am: 21c32402a6 am: 43692db7bc\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2786433\n\nChange-Id: I7db3b491d1be298067d9d6f7df7f5fba2184be87\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "43692db7bcc3094f7a0699034eecfc5efabfe0c1", "tree": "517cfd7d80ac803069c8be1833ef5c340ad851d6", "parents": [ "dc0f5a2e36f029e6ecc7e76798777a83382ebcc2", "21c32402a615b63f764aa5c6fd419c8378b3ec74" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Fri Oct 13 22:15:29 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 13 22:15:29 2023 +0000" }, "message": "Use install_symlink to add symlinks am: 92b51f2bbb am: 9246129559 am: 21c32402a6\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2786433\n\nChange-Id: If34cde53cced351f0d40e8d8e83db358ca45f92c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "21c32402a615b63f764aa5c6fd419c8378b3ec74", "tree": "517cfd7d80ac803069c8be1833ef5c340ad851d6", "parents": [ "6ec2d7334700768950a1cee01eaf753805b8d589", "9246129559c6fbd39332e35b771ce9848c3568ce" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Fri Oct 13 21:42:38 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 13 21:42:38 2023 +0000" }, "message": "Use install_symlink to add symlinks am: 92b51f2bbb am: 9246129559\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2786433\n\nChange-Id: Ie9152f66f278492e60051b32645c94e131dd8dd4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9246129559c6fbd39332e35b771ce9848c3568ce", "tree": "517cfd7d80ac803069c8be1833ef5c340ad851d6", "parents": [ "29b3adcc9576e19daff90a14238cba21da64f953", "92b51f2bbbab9f9b99ebf30dc102bb0b0f46a4bb" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Fri Oct 13 21:10:49 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 13 21:10:49 2023 +0000" }, "message": "Use install_symlink to add symlinks am: 92b51f2bbb\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2786433\n\nChange-Id: If6e3f2917de56043bba604c37b874bc3297faff5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "92b51f2bbbab9f9b99ebf30dc102bb0b0f46a4bb", "tree": "517cfd7d80ac803069c8be1833ef5c340ad851d6", "parents": [ "ae8d0785cbfc1e78fe212bd96f01bacb7a55b0b3" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Fri Oct 13 12:32:19 2023 -0700" }, "committer": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Fri Oct 13 12:32:19 2023 -0700" }, "message": "Use install_symlink to add symlinks\n\nUsing LOCAL_POST_INSTALL_CMD doesn\u0027t let the build system know that\nthe symlinks exist, and breaks hermetic partition builds.\n\nBug: 205632228\nTest: m installclean \u0026\u0026 m with aosp/2773149\nChange-Id: I3eddef663043a5de4eb60fb8bc82d0513aed55cb\n" }, { "commit": "4ebb729a3f4aa8e02b28a09c1b92510a9375ae44", "tree": "bd01a34f258f9ad44569249f4811363c0c7cba03", "parents": [ "a0adf97bf276b3ddb668df5320b715acb3fa0a56", "fa258e01d7a55378cf38b6cddbc806204c4af6b6" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Oct 07 00:19:36 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Oct 07 00:19:36 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: ae8d0785cb -s ours am: 29b3adcc95 -s ours am: 6ec2d73347 -s ours am: dc0f5a2e36 -s ours am: fa258e01d7 -s ours\n\nam skip reason: Merged-In I7c06ec56cda44684b8a69a78b1535dec1ef8eeba with SHA-1 420b4fbb05 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2775051\n\nChange-Id: I1028ad3e95ecf96312435999e29ecc7d8338a0ad\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fa258e01d7a55378cf38b6cddbc806204c4af6b6", "tree": "bd01a34f258f9ad44569249f4811363c0c7cba03", "parents": [ "9a738d57f497bd5368cfbd51c076f10b3a6ba7ee", "dc0f5a2e36f029e6ecc7e76798777a83382ebcc2" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 11:00:06 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 11:00:06 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: ae8d0785cb -s ours am: 29b3adcc95 -s ours am: 6ec2d73347 -s ours am: dc0f5a2e36 -s ours\n\nam skip reason: Merged-In I7c06ec56cda44684b8a69a78b1535dec1ef8eeba with SHA-1 420b4fbb05 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2775051\n\nChange-Id: I51ad9aff94708c2a66d3afcd1960ca3128bd12d0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "dc0f5a2e36f029e6ecc7e76798777a83382ebcc2", "tree": "bd01a34f258f9ad44569249f4811363c0c7cba03", "parents": [ "c5304d05a47f0cd033c5988a3db07bf3d844dac2", "6ec2d7334700768950a1cee01eaf753805b8d589" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 09:50:15 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 09:50:15 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: ae8d0785cb -s ours am: 29b3adcc95 -s ours am: 6ec2d73347 -s ours\n\nam skip reason: Merged-In I7c06ec56cda44684b8a69a78b1535dec1ef8eeba with SHA-1 420b4fbb05 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2775051\n\nChange-Id: I30a45013d505ca46db2a4ee9725690ed98feb439\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6ec2d7334700768950a1cee01eaf753805b8d589", "tree": "bd01a34f258f9ad44569249f4811363c0c7cba03", "parents": [ "196c4433a4e16436b4f4b2f6fa75e4f82a2b140a", "29b3adcc9576e19daff90a14238cba21da64f953" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 08:58:34 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 08:58:34 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: ae8d0785cb -s ours am: 29b3adcc95 -s ours\n\nam skip reason: Merged-In I7c06ec56cda44684b8a69a78b1535dec1ef8eeba with SHA-1 420b4fbb05 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2775051\n\nChange-Id: Ied6d388c4ca0c1ab3379ea1bac31c9903b043df0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "29b3adcc9576e19daff90a14238cba21da64f953", "tree": "bd01a34f258f9ad44569249f4811363c0c7cba03", "parents": [ "317b4b508e82b57cce2b612be1c6459642503a5d", "ae8d0785cbfc1e78fe212bd96f01bacb7a55b0b3" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 07:51:34 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 07:51:34 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: ae8d0785cb -s ours\n\nam skip reason: Merged-In I7c06ec56cda44684b8a69a78b1535dec1ef8eeba with SHA-1 420b4fbb05 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2775051\n\nChange-Id: I328889650ed77c054d9d4a69dc478fe56120a43d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ae8d0785cbfc1e78fe212bd96f01bacb7a55b0b3", "tree": "bd01a34f258f9ad44569249f4811363c0c7cba03", "parents": [ "420b4fbb054142d6026af4fb94d3cb57d1a4d060", "317b4b508e82b57cce2b612be1c6459642503a5d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 05 15:32:00 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 05 15:32:00 2023 -0700" }, "message": "Merge Android 14\n\nBug: 298295554\nMerged-In: I7c06ec56cda44684b8a69a78b1535dec1ef8eeba\nChange-Id: I30b26dd3fd4fe38b4099d1f37e394f1bc3d8691e\n" }, { "commit": "a0adf97bf276b3ddb668df5320b715acb3fa0a56", "tree": "bd01a34f258f9ad44569249f4811363c0c7cba03", "parents": [ "59a1ae9afa01f515cdb027a46c93d7a6461ecd36", "9a738d57f497bd5368cfbd51c076f10b3a6ba7ee" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Fri Sep 15 03:58:21 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 15 03:58:21 2023 +0000" }, "message": "Use String8/16 c_str am: 420b4fbb05 am: 317b4b508e am: 196c4433a4 am: c5304d05a4 am: 9a738d57f4\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2751993\n\nChange-Id: I674667c23bb15473ef92756d12c3f3c0a75b40bc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9a738d57f497bd5368cfbd51c076f10b3a6ba7ee", "tree": "bd01a34f258f9ad44569249f4811363c0c7cba03", "parents": [ "ebf005faf1426d862dd73e5941405a434f32f497", "c5304d05a47f0cd033c5988a3db07bf3d844dac2" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Fri Sep 15 02:59:26 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 15 02:59:26 2023 +0000" }, "message": "Use String8/16 c_str am: 420b4fbb05 am: 317b4b508e am: 196c4433a4 am: c5304d05a4\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2751993\n\nChange-Id: I40812062f46c70b55af35cd5c559bebe6a170b5a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c5304d05a47f0cd033c5988a3db07bf3d844dac2", "tree": "bd01a34f258f9ad44569249f4811363c0c7cba03", "parents": [ "b70ee4a1604a673b0a602825efa7ce30663fc99c", "196c4433a4e16436b4f4b2f6fa75e4f82a2b140a" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Fri Sep 15 02:10:57 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 15 02:10:57 2023 +0000" }, "message": "Use String8/16 c_str am: 420b4fbb05 am: 317b4b508e am: 196c4433a4\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2751993\n\nChange-Id: I7e59355747207484ee2c17d66ac3fe01121534ea\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "196c4433a4e16436b4f4b2f6fa75e4f82a2b140a", "tree": "bd01a34f258f9ad44569249f4811363c0c7cba03", "parents": [ "cadc4e01687104cccfe5fcd5c63a59381102d2f8", "317b4b508e82b57cce2b612be1c6459642503a5d" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Fri Sep 15 01:17:26 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 15 01:17:26 2023 +0000" }, "message": "Use String8/16 c_str am: 420b4fbb05 am: 317b4b508e\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2751993\n\nChange-Id: Ibb257c8f8bcc5137f24319f8a1d73405317c8ed8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "317b4b508e82b57cce2b612be1c6459642503a5d", "tree": "bd01a34f258f9ad44569249f4811363c0c7cba03", "parents": [ "bd5a1a486600949057a258da79fbf45430da144f", "420b4fbb054142d6026af4fb94d3cb57d1a4d060" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Fri Sep 15 00:19:12 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 15 00:19:12 2023 +0000" }, "message": "Use String8/16 c_str am: 420b4fbb05\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2751993\n\nChange-Id: I7820c103811c6fb1d95927d0c10afe4eb2bc1b26\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "59a1ae9afa01f515cdb027a46c93d7a6461ecd36", "tree": "513706bf2c4c59a853764d6fa3286494d05ef86e", "parents": [ "9447b4a78302b536ba67777e49c0f0b32acdadc5", "ebf005faf1426d862dd73e5941405a434f32f497" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Thu Sep 14 22:36:09 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Sep 14 22:36:09 2023 +0000" }, "message": "Migrate from android::String isEmpty to empty am: a7cf8bd13f am: bd5a1a4866 am: cadc4e0168 am: b70ee4a160 am: ebf005faf1\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2751986\n\nChange-Id: I2f1b60b08e5715861ee2d6b5155569aab25b17ed\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "420b4fbb054142d6026af4fb94d3cb57d1a4d060", "tree": "cfc78f1b87ac6fed1bb090a64e86b930aa2baecb", "parents": [ "a7cf8bd13f4ec708aeab415ad0790bca03102914" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Thu Sep 14 22:11:27 2023 +0000" }, "committer": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Thu Sep 14 22:11:27 2023 +0000" }, "message": "Use String8/16 c_str\n\nBug: 295394788\nTest: make checkbuild\nChange-Id: I7c06ec56cda44684b8a69a78b1535dec1ef8eeba\n" }, { "commit": "ebf005faf1426d862dd73e5941405a434f32f497", "tree": "513706bf2c4c59a853764d6fa3286494d05ef86e", "parents": [ "7b1ffc6599e563a51898db22a94e07755a1f1b3b", "b70ee4a1604a673b0a602825efa7ce30663fc99c" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Thu Sep 14 21:29:37 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Sep 14 21:29:37 2023 +0000" }, "message": "Migrate from android::String isEmpty to empty am: a7cf8bd13f am: bd5a1a4866 am: cadc4e0168 am: b70ee4a160\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2751986\n\nChange-Id: I632f371754a8a5c4de8ee934279d9c0d9f351c58\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b70ee4a1604a673b0a602825efa7ce30663fc99c", "tree": "513706bf2c4c59a853764d6fa3286494d05ef86e", "parents": [ "182767895b03c6d54153ed7ff4355032ba0016a7", "cadc4e01687104cccfe5fcd5c63a59381102d2f8" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Thu Sep 14 20:48:46 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Sep 14 20:48:46 2023 +0000" }, "message": "Migrate from android::String isEmpty to empty am: a7cf8bd13f am: bd5a1a4866 am: cadc4e0168\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2751986\n\nChange-Id: I92e69397f92926b432179d8df43968dd9d74403e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cadc4e01687104cccfe5fcd5c63a59381102d2f8", "tree": "513706bf2c4c59a853764d6fa3286494d05ef86e", "parents": [ "748be75bf42abdbd905fa7f9572c327fbcbb6242", "bd5a1a486600949057a258da79fbf45430da144f" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Thu Sep 14 19:54:35 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Sep 14 19:54:35 2023 +0000" }, "message": "Migrate from android::String isEmpty to empty am: a7cf8bd13f am: bd5a1a4866\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2751986\n\nChange-Id: I007d617eafdccb90a7f54b6c387c8ab51782ebc2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bd5a1a486600949057a258da79fbf45430da144f", "tree": "513706bf2c4c59a853764d6fa3286494d05ef86e", "parents": [ "d89f71b95fbc8d850eec9141cba9696da82865ad", "a7cf8bd13f4ec708aeab415ad0790bca03102914" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Thu Sep 14 18:58:23 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Sep 14 18:58:23 2023 +0000" }, "message": "Migrate from android::String isEmpty to empty am: a7cf8bd13f\n\nOriginal change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2751986\n\nChange-Id: Ieb4afe37f7aea5257c6270d91e396a4e2fe7f3cb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a7cf8bd13f4ec708aeab415ad0790bca03102914", "tree": "2eda230f56f78f13cc78416de13f482968009d58", "parents": [ "4ec61fb766b688f0bdc461817572c8857ec4075d" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Thu Sep 14 16:55:30 2023 +0000" }, "committer": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Thu Sep 14 16:55:30 2023 +0000" }, "message": "Migrate from android::String isEmpty to empty\n\nBug: 295394788\nTest: make checkbuild\nChange-Id: I4bf58cbb09e51eeea5c32181437e3c0a4b2fb417\n" }, { "commit": "9447b4a78302b536ba67777e49c0f0b32acdadc5", "tree": "d498ab794dfc2e571b9126c263f25321ebc5cea1", "parents": [ "f82ec3b9b03dc9404f0adfe7e5f0b9667302e16b", "7b1ffc6599e563a51898db22a94e07755a1f1b3b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 20:37:32 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 20:37:32 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: d89f71b95f -s ours am: 748be75bf4 -s ours am: 182767895b -s ours am: 7b1ffc6599 -s ours\n\nam skip reason: Merged-In Id0fa136019408a081b402c2e766fc11f52e45cbf with SHA-1 0ddc987c93 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/device/amlogic/yukawa/+/24182585\n\nChange-Id: Id1293f11d31a38a20acfa1d3cd3fa27e6075928d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7b1ffc6599e563a51898db22a94e07755a1f1b3b", "tree": "d498ab794dfc2e571b9126c263f25321ebc5cea1", "parents": [ "a9a21cc74dd322a68c915eb7fea96b52392530af", "182767895b03c6d54153ed7ff4355032ba0016a7" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 01:10:26 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 01:10:26 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: d89f71b95f -s ours am: 748be75bf4 -s ours am: 182767895b -s ours\n\nam skip reason: Merged-In Id0fa136019408a081b402c2e766fc11f52e45cbf with SHA-1 0ddc987c93 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/device/amlogic/yukawa/+/24182585\n\nChange-Id: Idb64d301cd573e005f8801dda6ac3077b1775cdd\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "182767895b03c6d54153ed7ff4355032ba0016a7", "tree": "d498ab794dfc2e571b9126c263f25321ebc5cea1", "parents": [ "a9a21cc74dd322a68c915eb7fea96b52392530af", "748be75bf42abdbd905fa7f9572c327fbcbb6242" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 00:34:42 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 00:34:42 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: d89f71b95f -s ours am: 748be75bf4 -s ours\n\nam skip reason: Merged-In Id0fa136019408a081b402c2e766fc11f52e45cbf with SHA-1 0ddc987c93 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/device/amlogic/yukawa/+/24182585\n\nChange-Id: I62bd627097aea52383b897e3676058f9c49916bb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "748be75bf42abdbd905fa7f9572c327fbcbb6242", "tree": "d498ab794dfc2e571b9126c263f25321ebc5cea1", "parents": [ "0ddc987c9391b5a4701fe6eb83c6400f3e8cd5d0", "d89f71b95fbc8d850eec9141cba9696da82865ad" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 28 23:58:42 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 28 23:58:42 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: d89f71b95f -s ours\n\nam skip reason: Merged-In Id0fa136019408a081b402c2e766fc11f52e45cbf with SHA-1 0ddc987c93 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/device/amlogic/yukawa/+/24182585\n\nChange-Id: I9a63b7db9623b9a740b48908385f05bdf29ff20d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d89f71b95fbc8d850eec9141cba9696da82865ad", "tree": "d498ab794dfc2e571b9126c263f25321ebc5cea1", "parents": [ "4ec61fb766b688f0bdc461817572c8857ec4075d", "0ddc987c9391b5a4701fe6eb83c6400f3e8cd5d0" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 14 15:32:37 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 14 15:32:37 2023 -0700" }, "message": "Merge Android U (ab/10368041)\n\nBug: 291102124\nMerged-In: Id0fa136019408a081b402c2e766fc11f52e45cbf\nChange-Id: Icfc9d06a3dd83dfe402926dd2af3615170c9c80a\n" } ], "next": "f82ec3b9b03dc9404f0adfe7e5f0b9667302e16b" }