)]}' { "log": [ { "commit": "9b70f594cf149c7c73989c78f03d210f8aa1c1f6", "tree": "4f5784f8f46b38bd0e0249c3b1d0ce4b4faf36a8", "parents": [ "72eda725ba7effbe1f8dd6352dcfdb74345d7697", "7f7162b415375ca1f2fae4dcc57441a94b8c80c5" ], "author": { "name": "Dmitrii Merkurev", "email": "dimorinny@google.com", "time": "Mon Mar 03 12:31:50 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Mar 03 12:31:50 2025 -0800" }, "message": "Merge \"Allow to disable default dto_print from posix sysdeps\" into main am: 7f7162b415\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/3517431\n\nChange-Id: Ia0d5db6fc141b31253b6c37084c7da56448816b6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7f7162b415375ca1f2fae4dcc57441a94b8c80c5", "tree": "4f5784f8f46b38bd0e0249c3b1d0ce4b4faf36a8", "parents": [ "21895382caff243c1b54f846e1eb8b352ce3983f", "371f54951022deb7ecaee753dd552a93c83e65bf" ], "author": { "name": "Dmitrii Merkurev", "email": "dimorinny@google.com", "time": "Mon Mar 03 12:13:23 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Mar 03 12:13:23 2025 -0800" }, "message": "Merge \"Allow to disable default dto_print from posix sysdeps\" into main" }, { "commit": "371f54951022deb7ecaee753dd552a93c83e65bf", "tree": "1e8a248c0cf48649c28c5aa3ba9566a46b8f4178", "parents": [ "1f2069feae82f12ffd2405b51ac22b60daebfe6d" ], "author": { "name": "Dmitrii Merkurev", "email": "dimorinny@google.com", "time": "Mon Mar 03 06:50:52 2025 +0000" }, "committer": { "name": "Dmitrii Merkurev", "email": "dimorinny@google.com", "time": "Mon Mar 03 06:50:52 2025 +0000" }, "message": "Allow to disable default dto_print from posix sysdeps\n\nBug: 394149272\nChange-Id: Ic5bda56fcab7ffb8a46810165826c1846d835853\nSigned-off-by: Dmitrii Merkurev \u003cdimorinny@google.com\u003e\n" }, { "commit": "72eda725ba7effbe1f8dd6352dcfdb74345d7697", "tree": "e4c93470ed8a64caa267eb72d21b4e384ea1ebc4", "parents": [ "8dfe67f16cac56e893f8d8cf9cb4ab5ccaedc0c1", "21895382caff243c1b54f846e1eb8b352ce3983f" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Fri Feb 28 19:49:23 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 28 19:49:23 2025 -0800" }, "message": "Cleanup python version properties am: 21895382ca\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/3518551\n\nChange-Id: Id8afd02b8024e32da633b2b4a98a48d2af832bd2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "21895382caff243c1b54f846e1eb8b352ce3983f", "tree": "e4c93470ed8a64caa267eb72d21b4e384ea1ebc4", "parents": [ "1f2069feae82f12ffd2405b51ac22b60daebfe6d" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Fri Feb 28 16:34:06 2025 -0800" }, "committer": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Fri Feb 28 16:34:06 2025 -0800" }, "message": "Cleanup python version properties\n\nNow that python 2 is fully removed, there\u0027s no need for\nversion-specific properties. Remove them.\n\nAlso remove usages of embedded_launcher: true, as that\nis the new default value.\n\nBug: 399954452\nTest: Presubmits\nChange-Id: Icbab4844c32199c8b3c90ebe4bde8934988f2cbf\n" }, { "commit": "8dfe67f16cac56e893f8d8cf9cb4ab5ccaedc0c1", "tree": "afb5bbc59e90daa15882a05f1ed39c6451cc7a71", "parents": [ "3b18aebf0f4d8c2f4a8fc85d0ad57499f4eb23b9", "69fe667437d36b701ba048969928f52296e59ba1" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 20 13:39:46 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 20 13:39:46 2024 -0800" }, "message": "Empty merge ab/12770256 into aosp-main-future\n\nMerged-In: I324769719748861aa20d6dd45c5f4f7c5b49f091\nChange-Id: I0477bc8feb2b8acee337ed96907af126f254764c\n" }, { "commit": "3b18aebf0f4d8c2f4a8fc85d0ad57499f4eb23b9", "tree": "afb5bbc59e90daa15882a05f1ed39c6451cc7a71", "parents": [ "bc5c0e47ad0dd24f14e34f6fd350a5bda49ba5b2", "1f2069feae82f12ffd2405b51ac22b60daebfe6d" ], "author": { "name": "Aleksandr Krasavin", "email": "akrasav@google.com", "time": "Tue Dec 17 02:53:29 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Dec 17 02:53:29 2024 -0800" }, "message": "Merge \"Fix potential NULL memory access\" into main am: 1f2069feae\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/3408232\n\nChange-Id: Ie4ff9cd364bc8bfbcbfe2c158eada82013954c5e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1f2069feae82f12ffd2405b51ac22b60daebfe6d", "tree": "afb5bbc59e90daa15882a05f1ed39c6451cc7a71", "parents": [ "1059af8ae14e0fc1679da43ca047152d2fc4de94", "bd7849f56f8852de3bf4b75d5576ad1790f3bf0d" ], "author": { "name": "Aleksandr Krasavin", "email": "akrasav@google.com", "time": "Tue Dec 17 02:29:32 2024 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Dec 17 02:29:32 2024 -0800" }, "message": "Merge \"Fix potential NULL memory access\" into main" }, { "commit": "bc5c0e47ad0dd24f14e34f6fd350a5bda49ba5b2", "tree": "d70fb1bc18fb31fdf47be6784e35d2ebce66b3ee", "parents": [ "6b9505cb971215ba34f6b7e874a370193da5209f", "1059af8ae14e0fc1679da43ca047152d2fc4de94" ], "author": { "name": "Aleksandr Krasavin", "email": "akrasav@google.com", "time": "Tue Dec 17 01:56:41 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Dec 17 01:56:41 2024 -0800" }, "message": "Merge \"Fix pointer arithmetics in libufdt\" into main am: 1059af8ae1\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/3410038\n\nChange-Id: I5339f8458d13957128d4d51a33ec18ff2463d795\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1059af8ae14e0fc1679da43ca047152d2fc4de94", "tree": "d70fb1bc18fb31fdf47be6784e35d2ebce66b3ee", "parents": [ "57506c9ad6e6081f947914b7c8601747b648b7e7", "17388679ee60432138327c65bbbf8337ae69234b" ], "author": { "name": "Aleksandr Krasavin", "email": "akrasav@google.com", "time": "Tue Dec 17 01:19:04 2024 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Dec 17 01:19:04 2024 -0800" }, "message": "Merge \"Fix pointer arithmetics in libufdt\" into main" }, { "commit": "6b9505cb971215ba34f6b7e874a370193da5209f", "tree": "4e3428491e7bbf09d488d1b38309cec4f1a3083b", "parents": [ "5a3a19cc0b602a5ad0ea975a936b3cea224db008", "57506c9ad6e6081f947914b7c8601747b648b7e7" ], "author": { "name": "Aleksandr Krasavin", "email": "akrasav@google.com", "time": "Mon Dec 16 07:57:39 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 16 07:57:39 2024 -0800" }, "message": "Check for null-termination of fixups in ufdt overlay am: 57506c9ad6\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/3412641\n\nChange-Id: I3ba2782e0a475ac204918d096d544d65958a592f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "57506c9ad6e6081f947914b7c8601747b648b7e7", "tree": "4e3428491e7bbf09d488d1b38309cec4f1a3083b", "parents": [ "5a3a19cc0b602a5ad0ea975a936b3cea224db008" ], "author": { "name": "Aleksandr Krasavin", "email": "akrasav@google.com", "time": "Mon Dec 16 10:45:11 2024 +0000" }, "committer": { "name": "Aleksandr Krasavin", "email": "akrasav@google.com", "time": "Mon Dec 16 10:45:11 2024 +0000" }, "message": "Check for null-termination of fixups in ufdt overlay\n\nlibufdt expects fixups in overlay tree to be null-terminated. This\ncondition was not checked which could lead to strlen() accessing the\nmemory out of bounds when overlay fdt is in incorrect format and\ncontains fixups that are not null-terminated.\nThis change adds a check that fixups paths are null-terminated in the\noverlay tree.\n\nFixes: b/379848664\nTest: builds\nTest: libufdt tests pass locally\nTest: libufdt fuzzer passes for corpus specified in the bug\nChange-Id: I3d12253c45b27b6cfe170439cad94635e77b584b\n" }, { "commit": "17388679ee60432138327c65bbbf8337ae69234b", "tree": "3ba8f224f36d971f0ceabede9aa14233b4f051a2", "parents": [ "5a3a19cc0b602a5ad0ea975a936b3cea224db008" ], "author": { "name": "Aleksandr Krasavin", "email": "akrasav@google.com", "time": "Thu Dec 12 19:58:41 2024 +0000" }, "committer": { "name": "Aleksandr Krasavin", "email": "akrasav@google.com", "time": "Fri Dec 13 15:54:53 2024 +0000" }, "message": "Fix pointer arithmetics in libufdt\n\nAccording to C standard, it is valid only to calculate pointers to\nallocated or one-past-last elements of allocated buffers. Calculating a\npointer to unallocated memory is illegal even if pointer is not\ndereferenced.\nThis change fixes such a pointer calculation.\n\nFixes: b/379085251\nTest: Builds\nTest: libufdt tests pass locally\nChange-Id: If4787d0135e11f519e1e8346e6c76b880e470199\n" }, { "commit": "bd7849f56f8852de3bf4b75d5576ad1790f3bf0d", "tree": "e4c5ccb8a854635e0c315faa1d62b40e1a028e56", "parents": [ "5a3a19cc0b602a5ad0ea975a936b3cea224db008" ], "author": { "name": "Aleksandr Krasavin", "email": "akrasav@google.com", "time": "Thu Dec 12 12:04:02 2024 +0000" }, "committer": { "name": "Aleksandr Krasavin", "email": "akrasav@google.com", "time": "Thu Dec 12 14:07:43 2024 +0000" }, "message": "Fix potential NULL memory access\n\nIn calls to libc functions, even if the number of bytes to process is 0, the pointer(s) need to be valid.\nThis change fixes potential UB in libufdt when invalid pointer could be passed to qsort() or memcpy().\n\nFixes: b/379079887\nFixes: b/379086679\nTest: Builds\nTest: run libufdt tests locally\nChange-Id: I3c8cc417e25d365209a443bb5e518bbeaf8332de\n" }, { "commit": "69fe667437d36b701ba048969928f52296e59ba1", "tree": "9803ed0537825d5b6f8142d9bf5bf4a0fd943e0c", "parents": [ "bf6da1f6e6072a8a336dd526c9f54cc933325f8d", "5a3a19cc0b602a5ad0ea975a936b3cea224db008" ], "author": { "name": "Bingwu Zhang", "email": "xtexchooser@duck.com", "time": "Mon Dec 02 06:10:18 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 02 06:10:18 2024 +0000" }, "message": "ufdt: use size_t for iteration in ufdt_apply_multioverlay am: 76c3a18e69 am: 5a3a19cc0b\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/3368290\n\nChange-Id: Ia737200c0b9659e7325bbb2ed1ecff5fbef31b1b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5a3a19cc0b602a5ad0ea975a936b3cea224db008", "tree": "9803ed0537825d5b6f8142d9bf5bf4a0fd943e0c", "parents": [ "bf6da1f6e6072a8a336dd526c9f54cc933325f8d", "76c3a18e69779fe729605b90407be2d7d838ded4" ], "author": { "name": "Bingwu Zhang", "email": "xtexchooser@duck.com", "time": "Mon Dec 02 05:12:54 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 02 05:12:54 2024 +0000" }, "message": "ufdt: use size_t for iteration in ufdt_apply_multioverlay am: 76c3a18e69\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/3368290\n\nChange-Id: I93e8bf7f8fe7da18c871e4beb9491b28495acd6a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "76c3a18e69779fe729605b90407be2d7d838ded4", "tree": "9803ed0537825d5b6f8142d9bf5bf4a0fd943e0c", "parents": [ "5a98056c70c20c87e1d5e4a8d24f914486da9d3d" ], "author": { "name": "Bingwu Zhang", "email": "xtexchooser@duck.com", "time": "Sun Nov 24 12:02:44 2024 +0800" }, "committer": { "name": "Bingwu Zhang", "email": "xtexchooser@duck.com", "time": "Sun Nov 24 12:05:49 2024 +0800" }, "message": "ufdt: use size_t for iteration in ufdt_apply_multioverlay\n\nThis makes it compile with -Wall -Wextra -Werror, both clang and g++.\n\nChange-Id: Iabe5d849a21590c39ebaa67777dea9b58fd7c057\nSigned-off-by: Bingwu Zhang \u003cxtexchooser@duck.com\u003e\n" }, { "commit": "bf6da1f6e6072a8a336dd526c9f54cc933325f8d", "tree": "3955ee74a119fda4be354933ec81330ef7c6e09f", "parents": [ "2548532c4babc8f4da91687c5c9466c7e400b2f0", "5a98056c70c20c87e1d5e4a8d24f914486da9d3d" ], "author": { "name": "Dmitrii Merkurev", "email": "dimorinny@google.com", "time": "Thu Aug 29 21:09:19 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 29 21:09:19 2024 +0000" }, "message": "Merge \"ufdt: provide API to apply multiple overlays\" into main am: 89539ce4d2 am: 5a98056c70\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/3235705\n\nChange-Id: I66b578eaab952ad9de08eb606725cab89af5abb8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5a98056c70c20c87e1d5e4a8d24f914486da9d3d", "tree": "3955ee74a119fda4be354933ec81330ef7c6e09f", "parents": [ "a1c7b66fa08b1a715139994a84dc7244ef336207", "89539ce4d2b2cabd351ae9fe5ec0bff03f8e1b3f" ], "author": { "name": "Dmitrii Merkurev", "email": "dimorinny@google.com", "time": "Thu Aug 29 21:00:09 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 29 21:00:09 2024 +0000" }, "message": "Merge \"ufdt: provide API to apply multiple overlays\" into main am: 89539ce4d2\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/3235705\n\nChange-Id: I76166a57ae8e53221200958955d4255010130320\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "89539ce4d2b2cabd351ae9fe5ec0bff03f8e1b3f", "tree": "3955ee74a119fda4be354933ec81330ef7c6e09f", "parents": [ "30d1812608f845a0d22b7fb5f1cbea26099ae489", "0ad34a3d930d2c1311a6c2d44033455b8c9afaa5" ], "author": { "name": "Dmitrii Merkurev", "email": "dimorinny@google.com", "time": "Thu Aug 29 20:48:57 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 29 20:48:57 2024 +0000" }, "message": "Merge \"ufdt: provide API to apply multiple overlays\" into main" }, { "commit": "2548532c4babc8f4da91687c5c9466c7e400b2f0", "tree": "740a44d8dd11539cf42fa1d26624a09677a9026b", "parents": [ "aa4f63675a14e9394914e1d505356c8283d83a3c", "a1c7b66fa08b1a715139994a84dc7244ef336207" ], "author": { "name": "Dmitrii Merkurev", "email": "dimorinny@google.com", "time": "Thu Aug 29 10:58:48 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 29 10:58:48 2024 +0000" }, "message": "libufdt: add dimorinny to the owners list am: 30d1812608 am: a1c7b66fa0\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/3247434\n\nChange-Id: I03e96673ba35c9518b9671d4ceaa14c314856b0f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a1c7b66fa08b1a715139994a84dc7244ef336207", "tree": "740a44d8dd11539cf42fa1d26624a09677a9026b", "parents": [ "7c2d26aef493f16426b727ea675d42213adf22e2", "30d1812608f845a0d22b7fb5f1cbea26099ae489" ], "author": { "name": "Dmitrii Merkurev", "email": "dimorinny@google.com", "time": "Thu Aug 29 10:40:59 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 29 10:40:59 2024 +0000" }, "message": "libufdt: add dimorinny to the owners list am: 30d1812608\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/3247434\n\nChange-Id: I135391470f1de199ccec178cc33e14341a81d05f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0ad34a3d930d2c1311a6c2d44033455b8c9afaa5", "tree": "908ff43030ea15bb6ede3f92a6a3cbd2ee42c4b1", "parents": [ "46cd6499d9cafa9dc4b48eb02a0baff643436287" ], "author": { "name": "Dmitrii Merkurev", "email": "dimorinny@google.com", "time": "Thu Aug 29 01:22:29 2024 +0100" }, "committer": { "name": "Dmitrii Merkurev", "email": "dimorinny@google.com", "time": "Thu Aug 29 01:22:29 2024 +0100" }, "message": "ufdt: provide API to apply multiple overlays\n\nUsing existing ufdt_apply_overlay to apply multiple\noverlays may be not efficient due to redundnat\nmain_fdt -\u003e ufdt conversions.\n\nTest: Used with GBL\nBug: 349352647\nChange-Id: Ibd3d556e547483ebcf3e8d8987b9c642e56a1843\nSigned-off-by: Dmitrii Merkurev \u003cdimorinny@google.com\u003e\n" }, { "commit": "30d1812608f845a0d22b7fb5f1cbea26099ae489", "tree": "740a44d8dd11539cf42fa1d26624a09677a9026b", "parents": [ "46cd6499d9cafa9dc4b48eb02a0baff643436287" ], "author": { "name": "Dmitrii Merkurev", "email": "dimorinny@google.com", "time": "Wed Aug 28 21:51:22 2024 +0100" }, "committer": { "name": "Dmitrii Merkurev", "email": "dimorinny@google.com", "time": "Wed Aug 28 20:52:26 2024 +0000" }, "message": "libufdt: add dimorinny to the owners list\n\nDiscussed with bowgotsai and dpursell. Gonna be Used\nand occasionaly developed by GBL team.\n\nBug: 349352647\nChange-Id: Id9f6bae7e0a9ddab889feec6a6bd3dc716818eff\nSigned-off-by: Dmitrii Merkurev \u003cdimorinny@google.com\u003e\n" }, { "commit": "aa4f63675a14e9394914e1d505356c8283d83a3c", "tree": "81416b0bc3e7ceffff2b95891ad398f4299235ff", "parents": [ "d8790c477f4589dcfcfd1069fb0d13c492d17b7b", "7c2d26aef493f16426b727ea675d42213adf22e2" ], "author": { "name": "Dmitrii Merkurev", "email": "dimorinny@google.com", "time": "Fri Aug 16 10:54:32 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 16 10:54:32 2024 +0000" }, "message": "ufdt: allow to opt-out default allocation sysdeps implementations am: 46cd6499d9 am: 7c2d26aef4\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/3220158\n\nChange-Id: I3c7fc9f3e6c101a806fb86d0d556762f331bbf3d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7c2d26aef493f16426b727ea675d42213adf22e2", "tree": "81416b0bc3e7ceffff2b95891ad398f4299235ff", "parents": [ "42b14c072d17cfb07af52acbcdf0c42dcee49cb9", "46cd6499d9cafa9dc4b48eb02a0baff643436287" ], "author": { "name": "Dmitrii Merkurev", "email": "dimorinny@google.com", "time": "Fri Aug 16 10:39:35 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 16 10:39:35 2024 +0000" }, "message": "ufdt: allow to opt-out default allocation sysdeps implementations am: 46cd6499d9\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/3220158\n\nChange-Id: If0472310a2b7d80d11d94f19193d82430a724ae8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "46cd6499d9cafa9dc4b48eb02a0baff643436287", "tree": "81416b0bc3e7ceffff2b95891ad398f4299235ff", "parents": [ "0dc6063a595553563b32e94676f9152342962263" ], "author": { "name": "Dmitrii Merkurev", "email": "dimorinny@google.com", "time": "Thu Aug 15 12:02:17 2024 +0100" }, "committer": { "name": "Dmitrii Merkurev", "email": "dimorinny@google.com", "time": "Thu Aug 15 12:02:17 2024 +0100" }, "message": "ufdt: allow to opt-out default allocation sysdeps implementations\n\nTest: compiled with GBL locally\nBug: 349352647\nChange-Id: I03c5a6ce1f491313673162d58d7a7b34c7daa11c\nSigned-off-by: Dmitrii Merkurev \u003cdimorinny@google.com\u003e\n" }, { "commit": "d8790c477f4589dcfcfd1069fb0d13c492d17b7b", "tree": "d8a978d52df8e7fd8b33d6018118b5e055f31b9e", "parents": [ "48bb33847df114a80dfe94476c58cb26c159dbae", "42b14c072d17cfb07af52acbcdf0c42dcee49cb9" ], "author": { "name": "Dmitrii Merkurev", "email": "dimorinny@google.com", "time": "Mon Aug 12 15:58:34 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 12 15:58:34 2024 +0000" }, "message": "ufdt: allow to opt-out dto_print from vendor sysdeps am: 0dc6063a59 am: 42b14c072d\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/3213801\n\nChange-Id: I7f2cd5d2c89921152a4944f86be42c987aaed684\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "42b14c072d17cfb07af52acbcdf0c42dcee49cb9", "tree": "d8a978d52df8e7fd8b33d6018118b5e055f31b9e", "parents": [ "48bb33847df114a80dfe94476c58cb26c159dbae", "0dc6063a595553563b32e94676f9152342962263" ], "author": { "name": "Dmitrii Merkurev", "email": "dimorinny@google.com", "time": "Mon Aug 12 15:20:18 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 12 15:20:18 2024 +0000" }, "message": "ufdt: allow to opt-out dto_print from vendor sysdeps am: 0dc6063a59\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/3213801\n\nChange-Id: Ice42888887abcdb69267c89e73d95d53f5b478e5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0dc6063a595553563b32e94676f9152342962263", "tree": "d8a978d52df8e7fd8b33d6018118b5e055f31b9e", "parents": [ "581f5a7a1110b2bb4f36ac3e30325eb5f46fe2fa" ], "author": { "name": "Dmitrii Merkurev", "email": "dimorinny@google.com", "time": "Fri Aug 09 16:48:02 2024 +0100" }, "committer": { "name": "Dmitrii Merkurev", "email": "dimorinny@google.com", "time": "Fri Aug 09 16:48:02 2024 +0100" }, "message": "ufdt: allow to opt-out dto_print from vendor sysdeps\n\nTrying to use ufdt inside UEFI app (go/android-gbl) which\ndoesn\u0027t have _dvprintf and va_list types avaiable. Allow\nto compile without dto_print, so we can override it with\nour implementation.\n\nTest: compiled with GBL locally\nBug: 349352647\nChange-Id: I29234ed8840490baac524188aaa55f64e1d34be5\nSigned-off-by: Dmitrii Merkurev \u003cdimorinny@google.com\u003e\n" }, { "commit": "48bb33847df114a80dfe94476c58cb26c159dbae", "tree": "9f382b33fbbb488ae8f5b9d8c245ea76f6226ef5", "parents": [ "00ee4cc4f5b4c32ea11b0e301c9a96d2967e51d1", "581f5a7a1110b2bb4f36ac3e30325eb5f46fe2fa" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Apr 22 17:42:26 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 22 17:42:26 2024 +0000" }, "message": "Merge \"Migrate Test Targets to New Android Ownership Model\" into main am: 355f0294ec am: 581f5a7a11\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2946292\n\nChange-Id: I459e1972402189e49dc86a57836ffc9e4b9ad594\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "581f5a7a1110b2bb4f36ac3e30325eb5f46fe2fa", "tree": "9f382b33fbbb488ae8f5b9d8c245ea76f6226ef5", "parents": [ "00ee4cc4f5b4c32ea11b0e301c9a96d2967e51d1", "355f0294ec7395b7959664859ad381ff5cbb9c09" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Apr 22 16:39:09 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 22 16:39:09 2024 +0000" }, "message": "Merge \"Migrate Test Targets to New Android Ownership Model\" into main am: 355f0294ec\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2946292\n\nChange-Id: I2254280243d75e0c8140b952139f732a7d19b871\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "355f0294ec7395b7959664859ad381ff5cbb9c09", "tree": "9f382b33fbbb488ae8f5b9d8c245ea76f6226ef5", "parents": [ "00ee4cc4f5b4c32ea11b0e301c9a96d2967e51d1", "2c899e7c0ca21ede9a0520d7a7ad0b4d88fccfe9" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Apr 22 16:17:09 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Apr 22 16:17:09 2024 +0000" }, "message": "Merge \"Migrate Test Targets to New Android Ownership Model\" into main" }, { "commit": "2c899e7c0ca21ede9a0520d7a7ad0b4d88fccfe9", "tree": "9f382b33fbbb488ae8f5b9d8c245ea76f6226ef5", "parents": [ "66e4db632d6018faf99acd108f61c2a4695421c7" ], "author": { "name": "Aditya Choudhary", "email": "caditya@google.com", "time": "Fri Feb 02 13:59:34 2024 +0000" }, "committer": { "name": "Aditya Choudhary", "email": "caditya@google.com", "time": "Fri Feb 02 13:59:34 2024 +0000" }, "message": "Migrate Test Targets to New Android Ownership Model\n\nThis CL is created as a best effort to migrate test targets to the new Android ownership model.\nIt is based on historical data from repository history and insights from git blame.\nGiven the nature of this effort, there may be instances of incorrect attribution. If you find incorrect or unnecessary\nattribution in this CL, please create a new CL to fix that.\n\nFor detailed guidelines and further information on the migration please refer to the link below,\ngo/new-android-ownership-model\n\nBug: 304529413\nTest: N/A\nChange-Id: I9ed254a9676dde566a03a75683f0ce30369997f6\n" }, { "commit": "00ee4cc4f5b4c32ea11b0e301c9a96d2967e51d1", "tree": "4d146b70e81e196e072bcb73f882b8a942f30c75", "parents": [ "166f0e303e63e234e76a766e8bcc896558139f77", "66e4db632d6018faf99acd108f61c2a4695421c7" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Oct 07 00:20:45 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Oct 07 00:20:45 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 53400ce7d2 -s ours am: dfe5a95db9 -s ours am: 5b00ae6eaa -s ours am: b79c673897 -s ours am: 66e4db632d -s ours\n\nam skip reason: Merged-In I50f6f6a22736f8b367bd140cd3e5e0e68dbe6cea with SHA-1 df393309db is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2777058\n\nChange-Id: Ia363c23680f96af1a1afcd4167d8d848a3a8e00b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "66e4db632d6018faf99acd108f61c2a4695421c7", "tree": "4d146b70e81e196e072bcb73f882b8a942f30c75", "parents": [ "c8e01fbe411a340148bf8b02cc1691cb60bb15a4", "b79c67389787ff0f1d8962bb5b0627bacb68d81d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 11:01:15 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 11:01:15 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 53400ce7d2 -s ours am: dfe5a95db9 -s ours am: 5b00ae6eaa -s ours am: b79c673897 -s ours\n\nam skip reason: Merged-In I50f6f6a22736f8b367bd140cd3e5e0e68dbe6cea with SHA-1 df393309db is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2777058\n\nChange-Id: I860392a302357a337aa4ede5acf83d437f38d042\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b79c67389787ff0f1d8962bb5b0627bacb68d81d", "tree": "4d146b70e81e196e072bcb73f882b8a942f30c75", "parents": [ "5ce94fe72411f6afb3b91eb464335295864fa94a", "5b00ae6eaafcb7064bbcee087c252b5e977511c3" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 09:51:24 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 09:51:24 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 53400ce7d2 -s ours am: dfe5a95db9 -s ours am: 5b00ae6eaa -s ours\n\nam skip reason: Merged-In I50f6f6a22736f8b367bd140cd3e5e0e68dbe6cea with SHA-1 df393309db is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2777058\n\nChange-Id: I16746b1120a33e5ee4a89fcf1863e2214a246fae\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5b00ae6eaafcb7064bbcee087c252b5e977511c3", "tree": "4d146b70e81e196e072bcb73f882b8a942f30c75", "parents": [ "15287156ffce37d0cab0886a9f0e476785b8a5eb", "dfe5a95db917ed4a9d2f25363a320b15a7d9d244" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 08:59:44 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 08:59:44 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 53400ce7d2 -s ours am: dfe5a95db9 -s ours\n\nam skip reason: Merged-In I50f6f6a22736f8b367bd140cd3e5e0e68dbe6cea with SHA-1 df393309db is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2777058\n\nChange-Id: I156fa0bcb1b7d54988b25133c9e55903c591869b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "dfe5a95db917ed4a9d2f25363a320b15a7d9d244", "tree": "4d146b70e81e196e072bcb73f882b8a942f30c75", "parents": [ "fc8695529a019c55d923415004ebc595947fc440", "53400ce7d26a6dd05ecf653d0108640eaa1299f3" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 07:52:44 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 07:52:44 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 53400ce7d2 -s ours\n\nam skip reason: Merged-In I50f6f6a22736f8b367bd140cd3e5e0e68dbe6cea with SHA-1 df393309db is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2777058\n\nChange-Id: I4f77c0568bf0cc23b9b830a7c27b06e0993d27c9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "53400ce7d26a6dd05ecf653d0108640eaa1299f3", "tree": "4d146b70e81e196e072bcb73f882b8a942f30c75", "parents": [ "4241296c2c7852c3578dcc888c5cebf6b6db9ada", "fc8695529a019c55d923415004ebc595947fc440" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 05 15:45:24 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 05 15:45:24 2023 -0700" }, "message": "Merge Android 14\n\nBug: 298295554\nMerged-In: I50f6f6a22736f8b367bd140cd3e5e0e68dbe6cea\nChange-Id: I82b0f1cc5d22cefa04c0e3cc70a439337d0352a2\n" }, { "commit": "166f0e303e63e234e76a766e8bcc896558139f77", "tree": "4d146b70e81e196e072bcb73f882b8a942f30c75", "parents": [ "152eb5c9dc1fc71b2f191a98740da4bace235812", "c8e01fbe411a340148bf8b02cc1691cb60bb15a4" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 20:38:39 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 20:38:39 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: fc8695529a -s ours am: 15287156ff -s ours am: 5ce94fe724 -s ours am: c8e01fbe41 -s ours\n\nam skip reason: Merged-In I13480bb2489b45a0eea0310acac16de05ece2df1 with SHA-1 7699eed4d7 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/24182876\n\nChange-Id: I2e9061f3eee6703b5e8a817214ae543df9fc46f3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c8e01fbe411a340148bf8b02cc1691cb60bb15a4", "tree": "4d146b70e81e196e072bcb73f882b8a942f30c75", "parents": [ "21d86188862c1265b70a7206682019700cbb22f3", "5ce94fe72411f6afb3b91eb464335295864fa94a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 01:11:33 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 01:11:33 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: fc8695529a -s ours am: 15287156ff -s ours am: 5ce94fe724 -s ours\n\nam skip reason: Merged-In I13480bb2489b45a0eea0310acac16de05ece2df1 with SHA-1 7699eed4d7 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/24182876\n\nChange-Id: I94d493d1eaf0b2238e09cfe4f0286eece13856d7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5ce94fe72411f6afb3b91eb464335295864fa94a", "tree": "4d146b70e81e196e072bcb73f882b8a942f30c75", "parents": [ "21d86188862c1265b70a7206682019700cbb22f3", "15287156ffce37d0cab0886a9f0e476785b8a5eb" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 00:35:50 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 00:35:50 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: fc8695529a -s ours am: 15287156ff -s ours\n\nam skip reason: Merged-In I13480bb2489b45a0eea0310acac16de05ece2df1 with SHA-1 7699eed4d7 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/24182876\n\nChange-Id: I8b737bd33b64e7e68ddf73e0d846d602731e59c1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "15287156ffce37d0cab0886a9f0e476785b8a5eb", "tree": "4d146b70e81e196e072bcb73f882b8a942f30c75", "parents": [ "7699eed4d7f6e1c048d62536d994cb0ce9d92922", "fc8695529a019c55d923415004ebc595947fc440" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 28 23:59:50 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 28 23:59:50 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: fc8695529a -s ours\n\nam skip reason: Merged-In I13480bb2489b45a0eea0310acac16de05ece2df1 with SHA-1 7699eed4d7 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/24182876\n\nChange-Id: I59674251130b35c217b639157fd9607fe5c790e1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fc8695529a019c55d923415004ebc595947fc440", "tree": "4d146b70e81e196e072bcb73f882b8a942f30c75", "parents": [ "4241296c2c7852c3578dcc888c5cebf6b6db9ada", "7699eed4d7f6e1c048d62536d994cb0ce9d92922" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 14 15:44:58 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 14 15:44:58 2023 -0700" }, "message": "Merge Android U (ab/10368041)\n\nBug: 291102124\nMerged-In: I13480bb2489b45a0eea0310acac16de05ece2df1\nChange-Id: I3bcd185528ed2640a619fe261ef5eb316e8769b8\n" }, { "commit": "152eb5c9dc1fc71b2f191a98740da4bace235812", "tree": "4d146b70e81e196e072bcb73f882b8a942f30c75", "parents": [ "dbd507892250fbbfd40526db2009462491190a9d", "85261e3a6be7052f85b1acfd380d4cecf89801a0" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 15 02:14:45 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Mar 15 02:14:45 2023 +0000" }, "message": "Merge \"[automerger skipped] Merge Android 13 QPR2 am: 6fdc9953f4 -s ours am: 4dd58128c0 -s ours am: 4241296c2c -s ours am: 7699eed4d7 -s ours am: 21d8618886 -s ours\"" }, { "commit": "85261e3a6be7052f85b1acfd380d4cecf89801a0", "tree": "4d146b70e81e196e072bcb73f882b8a942f30c75", "parents": [ "56465575182fc5d7ba4bd0388e9b7d2c9a116680", "21d86188862c1265b70a7206682019700cbb22f3" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Mar 15 02:04:15 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 15 02:04:15 2023 +0000" }, "message": "[automerger skipped] Merge Android 13 QPR2 am: 6fdc9953f4 -s ours am: 4dd58128c0 -s ours am: 4241296c2c -s ours am: 7699eed4d7 -s ours am: 21d8618886 -s ours\n\nam skip reason: Merged-In I03a56f68a7e53d941809560b943153b8fc31decc with SHA-1 cd47b8f445 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2487024\n\nChange-Id: Iff1d42c0c75a4628e4439716605fdfeca3f278fb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "dbd507892250fbbfd40526db2009462491190a9d", "tree": "4d146b70e81e196e072bcb73f882b8a942f30c75", "parents": [ "56465575182fc5d7ba4bd0388e9b7d2c9a116680", "f80bca6977750793d7ac884a9b57a1bfa93e0ec7" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Mar 15 02:03:59 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 15 02:03:59 2023 +0000" }, "message": "[automerger skipped] Merge Android 13 QPR2 am: 6fdc9953f4 -s ours am: 4dd58128c0 -s ours am: 4241296c2c -s ours am: 7699eed4d7 -s ours am: f80bca6977 -s ours\n\nam skip reason: Merged-In I03a56f68a7e53d941809560b943153b8fc31decc with SHA-1 cd47b8f445 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2487024\n\nChange-Id: I015b8a2ddf93c8e0c62dea674f274e39c899ad8a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "21d86188862c1265b70a7206682019700cbb22f3", "tree": "4d146b70e81e196e072bcb73f882b8a942f30c75", "parents": [ "56465575182fc5d7ba4bd0388e9b7d2c9a116680", "7699eed4d7f6e1c048d62536d994cb0ce9d92922" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Mar 15 01:10:59 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 15 01:10:59 2023 +0000" }, "message": "[automerger skipped] Merge Android 13 QPR2 am: 6fdc9953f4 -s ours am: 4dd58128c0 -s ours am: 4241296c2c -s ours am: 7699eed4d7 -s ours\n\nam skip reason: Merged-In I03a56f68a7e53d941809560b943153b8fc31decc with SHA-1 cd47b8f445 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2487024\n\nChange-Id: Ib9ef4e6e51d4a851fabc75f58a460840db50207d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f80bca6977750793d7ac884a9b57a1bfa93e0ec7", "tree": "4d146b70e81e196e072bcb73f882b8a942f30c75", "parents": [ "56465575182fc5d7ba4bd0388e9b7d2c9a116680", "7699eed4d7f6e1c048d62536d994cb0ce9d92922" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Mar 15 01:07:39 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 15 01:07:39 2023 +0000" }, "message": "[automerger skipped] Merge Android 13 QPR2 am: 6fdc9953f4 -s ours am: 4dd58128c0 -s ours am: 4241296c2c -s ours am: 7699eed4d7 -s ours\n\nam skip reason: Merged-In I03a56f68a7e53d941809560b943153b8fc31decc with SHA-1 cd47b8f445 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2487024\n\nChange-Id: I82157e93ab2f71e702fff3caccebe4b5e5659516\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7699eed4d7f6e1c048d62536d994cb0ce9d92922", "tree": "4d146b70e81e196e072bcb73f882b8a942f30c75", "parents": [ "56465575182fc5d7ba4bd0388e9b7d2c9a116680", "4241296c2c7852c3578dcc888c5cebf6b6db9ada" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Mar 15 00:06:30 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 15 00:06:30 2023 +0000" }, "message": "[automerger skipped] Merge Android 13 QPR2 am: 6fdc9953f4 -s ours am: 4dd58128c0 -s ours am: 4241296c2c -s ours\n\nam skip reason: Merged-In I03a56f68a7e53d941809560b943153b8fc31decc with SHA-1 cd47b8f445 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2487024\n\nChange-Id: I13480bb2489b45a0eea0310acac16de05ece2df1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4241296c2c7852c3578dcc888c5cebf6b6db9ada", "tree": "a39fe51a14f9ee0f2ab5be69528a409b37c1a975", "parents": [ "67d753fd725d4932982da4b6af385e23338616ec", "4dd58128c0a84da6e9e0cedde9c3ef1b349eb8a6" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Mar 14 23:06:25 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 14 23:06:25 2023 +0000" }, "message": "[automerger skipped] Merge Android 13 QPR2 am: 6fdc9953f4 -s ours am: 4dd58128c0 -s ours\n\nam skip reason: Merged-In I03a56f68a7e53d941809560b943153b8fc31decc with SHA-1 cd47b8f445 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2487024\n\nChange-Id: I31da8f2036bfabcdbd9ab51443c94d7ee75d466d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4dd58128c0a84da6e9e0cedde9c3ef1b349eb8a6", "tree": "a39fe51a14f9ee0f2ab5be69528a409b37c1a975", "parents": [ "12dc18e4c43a20119fd6313931b5c7e319327a50", "6fdc9953f48a217f2977c3798f86ccf790b97f87" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Mar 14 22:32:38 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 14 22:32:38 2023 +0000" }, "message": "[automerger skipped] Merge Android 13 QPR2 am: 6fdc9953f4 -s ours\n\nam skip reason: Merged-In I03a56f68a7e53d941809560b943153b8fc31decc with SHA-1 cd47b8f445 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2487024\n\nChange-Id: Ide668513d3769988bd6c8055497ea09352b72851\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6fdc9953f48a217f2977c3798f86ccf790b97f87", "tree": "a39fe51a14f9ee0f2ab5be69528a409b37c1a975", "parents": [ "f8d3af72aab9ab4f1278ba6ffc0688dea746ae65", "12dc18e4c43a20119fd6313931b5c7e319327a50" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Mar 13 23:11:40 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Mar 13 23:11:40 2023 -0700" }, "message": "Merge Android 13 QPR2\n\nBug: 273316506\nMerged-In: I03a56f68a7e53d941809560b943153b8fc31decc\nChange-Id: I220b7e9762876d3e0ff8265fda0083ec1972e400\n" }, { "commit": "56465575182fc5d7ba4bd0388e9b7d2c9a116680", "tree": "4d146b70e81e196e072bcb73f882b8a942f30c75", "parents": [ "13f7df079afddc8ca7bb7ba88e1b3f915bae9525", "67d753fd725d4932982da4b6af385e23338616ec" ], "author": { "name": "Kyeongkab.Nam", "email": "Kyeongkab.Nam@sony.com", "time": "Wed Jan 25 21:58:38 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 25 21:58:38 2023 +0000" }, "message": "Fix a test to check duplicated phandles am: 718007765a am: bc2c5f2384 am: cee5ba9a09 am: ec8de9b1b2 am: a9e0e072e9 am: 214fbdfb83 am: 67d753fd72\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2385752\n\nChange-Id: I83f7b0cdff9d3318f844cee1be4db01151b230d4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "67d753fd725d4932982da4b6af385e23338616ec", "tree": "a39fe51a14f9ee0f2ab5be69528a409b37c1a975", "parents": [ "60e32fb1cf8dd3629211b7d8806a954a800e6fa9", "214fbdfb834313a982b9b54c0f6909a62bdbaf55" ], "author": { "name": "Kyeongkab.Nam", "email": "Kyeongkab.Nam@sony.com", "time": "Wed Jan 25 21:14:46 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 25 21:14:46 2023 +0000" }, "message": "Fix a test to check duplicated phandles am: 718007765a am: bc2c5f2384 am: cee5ba9a09 am: ec8de9b1b2 am: a9e0e072e9 am: 214fbdfb83\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2385752\n\nChange-Id: I0ec18554ccb4578c681cd0fe2baaea2eca621187\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "13f7df079afddc8ca7bb7ba88e1b3f915bae9525", "tree": "4d146b70e81e196e072bcb73f882b8a942f30c75", "parents": [ "f986c148e415a2f6f5b76e01f297d26fdae88594", "d9a83c176299b96b77c720e513af98618a2d23f0" ], "author": { "name": "Kyeongkab.Nam", "email": "Kyeongkab.Nam@sony.com", "time": "Wed Jan 25 20:33:48 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 25 20:33:48 2023 +0000" }, "message": "Fix a test to check duplicated phandles am: 718007765a am: bc2c5f2384 am: cee5ba9a09 am: ec8de9b1b2 am: d9a83c1762\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2385752\n\nChange-Id: I6f144f072aec60399b795742e806e20e2b3367e4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "214fbdfb834313a982b9b54c0f6909a62bdbaf55", "tree": "bb0bff1dcdd6cc4431d2e4776f0cd9c8e9a335e3", "parents": [ "b3a49bc3b7735690cead723f7dc3feea05e3de87", "a9e0e072e93da5c95e7bfcfaac5910bd6a73e3a3" ], "author": { "name": "Kyeongkab.Nam", "email": "Kyeongkab.Nam@sony.com", "time": "Wed Jan 25 20:33:44 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 25 20:33:44 2023 +0000" }, "message": "Fix a test to check duplicated phandles am: 718007765a am: bc2c5f2384 am: cee5ba9a09 am: ec8de9b1b2 am: a9e0e072e9\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2385752\n\nChange-Id: Ia6e58222617022ea04daa895522e1e0341b76d14\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a9e0e072e93da5c95e7bfcfaac5910bd6a73e3a3", "tree": "4a142e746ff1e2e7aec90c68be63fad6305b7903", "parents": [ "0206b5ac3420ab6d6a77fe77553d42f677dc5116", "ec8de9b1b2f0bce10cc7d592952f78ce8bd7db58" ], "author": { "name": "Kyeongkab.Nam", "email": "Kyeongkab.Nam@sony.com", "time": "Wed Jan 25 19:31:46 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 25 19:31:46 2023 +0000" }, "message": "Fix a test to check duplicated phandles am: 718007765a am: bc2c5f2384 am: cee5ba9a09 am: ec8de9b1b2\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2385752\n\nChange-Id: I307c3ab7b3e63bedace5980c86dbd01930475191\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d9a83c176299b96b77c720e513af98618a2d23f0", "tree": "4a142e746ff1e2e7aec90c68be63fad6305b7903", "parents": [ "176be2e95dfd33b3ac02f896b168645bac0d3e60", "ec8de9b1b2f0bce10cc7d592952f78ce8bd7db58" ], "author": { "name": "Kyeongkab.Nam", "email": "Kyeongkab.Nam@sony.com", "time": "Wed Jan 25 19:27:52 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 25 19:27:52 2023 +0000" }, "message": "Fix a test to check duplicated phandles am: 718007765a am: bc2c5f2384 am: cee5ba9a09 am: ec8de9b1b2\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2385752\n\nChange-Id: I8d6adb0680e4d5239686b2ebcbf5eb2b2e34305f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ec8de9b1b2f0bce10cc7d592952f78ce8bd7db58", "tree": "4a142e746ff1e2e7aec90c68be63fad6305b7903", "parents": [ "0734692e4dbe1f32d051360b3c8aa77f42932328", "cee5ba9a09cbcdfabd8518b4f4895fd6ad130019" ], "author": { "name": "Kyeongkab.Nam", "email": "Kyeongkab.Nam@sony.com", "time": "Wed Jan 25 18:37:53 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 25 18:37:53 2023 +0000" }, "message": "Fix a test to check duplicated phandles am: 718007765a am: bc2c5f2384 am: cee5ba9a09\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2385752\n\nChange-Id: I46634a9110876b62698a121c2f0da60d32db593e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f986c148e415a2f6f5b76e01f297d26fdae88594", "tree": "4d146b70e81e196e072bcb73f882b8a942f30c75", "parents": [ "f8033dc5e066ef518d71a4b5f06764be22b85d03", "60e32fb1cf8dd3629211b7d8806a954a800e6fa9" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sun Jan 15 12:24:17 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Jan 15 12:24:17 2023 +0000" }, "message": "Merge \"verifyDTBO: update to use bootconfig\" am: f8d3af72aa am: 12dc18e4c4 am: 60e32fb1cf\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2388574\n\nChange-Id: I4cd449ec6e65f082c33b68bbd3608205c5a4106d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "60e32fb1cf8dd3629211b7d8806a954a800e6fa9", "tree": "a39fe51a14f9ee0f2ab5be69528a409b37c1a975", "parents": [ "b01c76e33442bc68c050e1d43824e818a5094f7a", "12dc18e4c43a20119fd6313931b5c7e319327a50" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sun Jan 15 11:48:13 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Jan 15 11:48:13 2023 +0000" }, "message": "Merge \"verifyDTBO: update to use bootconfig\" am: f8d3af72aa am: 12dc18e4c4\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2388574\n\nChange-Id: Icdcc9b232ea3b5e36a19646e2e2081fdeb89fd0c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "12dc18e4c43a20119fd6313931b5c7e319327a50", "tree": "a39fe51a14f9ee0f2ab5be69528a409b37c1a975", "parents": [ "0a14873b3df2d07fab72ffe31f01f21051a3df67", "f8d3af72aab9ab4f1278ba6ffc0688dea746ae65" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sun Jan 15 11:15:36 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Jan 15 11:15:36 2023 +0000" }, "message": "Merge \"verifyDTBO: update to use bootconfig\" am: f8d3af72aa\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2388574\n\nChange-Id: I7cab2e229c9cfc83981c5eee8dde7272d8923f73\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f8d3af72aab9ab4f1278ba6ffc0688dea746ae65", "tree": "b832eb7a05116d4c23eeaaf82c0b160e61d96713", "parents": [ "86fd655613c99012ee599e7766505fcfb9ebd032", "df393309dbbfe3993363ebc62d56ecd0ba4dbe3d" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sun Jan 15 10:48:17 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Sun Jan 15 10:48:17 2023 +0000" }, "message": "Merge \"verifyDTBO: update to use bootconfig\"" }, { "commit": "f8033dc5e066ef518d71a4b5f06764be22b85d03", "tree": "6be3d67abeca7a3f922de2b7cdb1d08b8da42c9d", "parents": [ "2879fa570ce4a9747f922a04a2124aa2d4dc6f4e", "b01c76e33442bc68c050e1d43824e818a5094f7a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Jan 13 21:39:02 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 13 21:39:02 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge tm-qpr-dev-plus-aosp-without-vendor@9467136\" into stage-aosp-master am: 0a14873b3d -s ours am: b01c76e334 -s ours\n\nam skip reason: Merged-In I03a56f68a7e53d941809560b943153b8fc31decc with SHA-1 cd47b8f445 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/20956737\n\nChange-Id: I691695dcac203c8ea202e38fe545015a77550ecb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2879fa570ce4a9747f922a04a2124aa2d4dc6f4e", "tree": "6be3d67abeca7a3f922de2b7cdb1d08b8da42c9d", "parents": [ "223971dba23bfccafb30281d00d5602d567fd476", "6a60424b6b287ce82cbba9976a247055b3d65c83" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Jan 13 21:35:54 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 13 21:35:54 2023 +0000" }, "message": "[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 0dc1efa4ca -s ours am: 6a60424b6b -s ours\n\nam skip reason: Merged-In I03a56f68a7e53d941809560b943153b8fc31decc with SHA-1 cd47b8f445 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/20956737\n\nChange-Id: I2c4d965fe7cc05e7cb1027488945f9ce5cdad745\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "df393309dbbfe3993363ebc62d56ecd0ba4dbe3d", "tree": "b832eb7a05116d4c23eeaaf82c0b160e61d96713", "parents": [ "c63cf42770a950d01cab196cbc92360880a2a83a" ], "author": { "name": "Will McVicker", "email": "willmcvicker@google.com", "time": "Fri Jan 13 10:59:46 2023 -0800" }, "committer": { "name": "Will McVicker", "email": "willmcvicker@google.com", "time": "Fri Jan 13 11:05:20 2023 -0800" }, "message": "verifyDTBO: update to use bootconfig\n\nUpdate verifyDTBO.sh to match the VTS tests FirmwareDtboVerification\nwhich first checks the bootconfig for the dtbo_idx. If it doesn\u0027t find\nit, then check the kernel command line.\n\nBug: 265256786\nTested: run ./verifyDTBO.sh on an oriole\nChange-Id: I50f6f6a22736f8b367bd140cd3e5e0e68dbe6cea\n" }, { "commit": "b01c76e33442bc68c050e1d43824e818a5094f7a", "tree": "de4f284f37773e18eb7a68a4edadac56b895bb7f", "parents": [ "6a60424b6b287ce82cbba9976a247055b3d65c83", "0a14873b3df2d07fab72ffe31f01f21051a3df67" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Jan 13 08:11:35 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 13 08:11:35 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge tm-qpr-dev-plus-aosp-without-vendor@9467136\" into stage-aosp-master am: 0a14873b3d -s ours\n\nam skip reason: Merged-In I03a56f68a7e53d941809560b943153b8fc31decc with SHA-1 cd47b8f445 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/20956737\n\nChange-Id: I36d23cbffabe7f8588dce6cbf45f4ab357fe3904\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6a60424b6b287ce82cbba9976a247055b3d65c83", "tree": "de4f284f37773e18eb7a68a4edadac56b895bb7f", "parents": [ "cf01ad26b7528e4dcbf38d8a9efbd0146b49a05f", "0dc1efa4ca1f7a11e9f9e7ac4335300999f980ef" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Jan 13 08:08:36 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 13 08:08:36 2023 +0000" }, "message": "[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 0dc1efa4ca -s ours\n\nam skip reason: Merged-In I03a56f68a7e53d941809560b943153b8fc31decc with SHA-1 cd47b8f445 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/20956737\n\nChange-Id: I10efb8a51324808555667fcd8cf1bef180df7f1a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0a14873b3df2d07fab72ffe31f01f21051a3df67", "tree": "de4f284f37773e18eb7a68a4edadac56b895bb7f", "parents": [ "4d2cf52081fbd897f2e8c65277e0ba076975f0ec", "0dc1efa4ca1f7a11e9f9e7ac4335300999f980ef" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Jan 13 07:32:39 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jan 13 07:32:39 2023 +0000" }, "message": "Merge \"Merge tm-qpr-dev-plus-aosp-without-vendor@9467136\" into stage-aosp-master" }, { "commit": "223971dba23bfccafb30281d00d5602d567fd476", "tree": "6be3d67abeca7a3f922de2b7cdb1d08b8da42c9d", "parents": [ "dd5fec1f0eeff01efc3181e80ed8352d81a2ee3e", "cf01ad26b7528e4dcbf38d8a9efbd0146b49a05f" ], "author": { "name": "Kyeongkab.Nam", "email": "Kyeongkab.Nam@sony.com", "time": "Fri Jan 13 05:33:17 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 13 05:33:17 2023 +0000" }, "message": "Fix a test to check duplicated phandles am: 718007765a am: bc2c5f2384 am: cee5ba9a09 am: 86fd655613 am: 4d2cf52081 am: cf01ad26b7\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2385752\n\nChange-Id: Ibb7e49974d7fc4fd3b87899e11f9ed70f6301965\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cf01ad26b7528e4dcbf38d8a9efbd0146b49a05f", "tree": "de4f284f37773e18eb7a68a4edadac56b895bb7f", "parents": [ "13f2d8922efbb7d991956d079b709c0681a7c21a", "4d2cf52081fbd897f2e8c65277e0ba076975f0ec" ], "author": { "name": "Kyeongkab.Nam", "email": "Kyeongkab.Nam@sony.com", "time": "Fri Jan 13 04:53:25 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 13 04:53:25 2023 +0000" }, "message": "Fix a test to check duplicated phandles am: 718007765a am: bc2c5f2384 am: cee5ba9a09 am: 86fd655613 am: 4d2cf52081\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2385752\n\nChange-Id: I847a593a231d11659b2b1bf8685b5895615e9d3d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4d2cf52081fbd897f2e8c65277e0ba076975f0ec", "tree": "5141389bae83959a988b943fd180b992b4977e12", "parents": [ "ea682bf4a21b3fa34c4204b228a38f4bf6c7317f", "86fd655613c99012ee599e7766505fcfb9ebd032" ], "author": { "name": "Kyeongkab.Nam", "email": "Kyeongkab.Nam@sony.com", "time": "Fri Jan 13 04:15:11 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 13 04:15:11 2023 +0000" }, "message": "Fix a test to check duplicated phandles am: 718007765a am: bc2c5f2384 am: cee5ba9a09 am: 86fd655613\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2385752\n\nChange-Id: I461a9acb0600237eefc89c18237781b527e9b74a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "86fd655613c99012ee599e7766505fcfb9ebd032", "tree": "5141389bae83959a988b943fd180b992b4977e12", "parents": [ "c63cf42770a950d01cab196cbc92360880a2a83a", "cee5ba9a09cbcdfabd8518b4f4895fd6ad130019" ], "author": { "name": "Kyeongkab.Nam", "email": "Kyeongkab.Nam@sony.com", "time": "Fri Jan 13 03:04:32 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 13 03:04:32 2023 +0000" }, "message": "Fix a test to check duplicated phandles am: 718007765a am: bc2c5f2384 am: cee5ba9a09\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2385752\n\nChange-Id: I5b611cdeee446045469095839931b759244d4f0d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cee5ba9a09cbcdfabd8518b4f4895fd6ad130019", "tree": "4a142e746ff1e2e7aec90c68be63fad6305b7903", "parents": [ "0734692e4dbe1f32d051360b3c8aa77f42932328", "bc2c5f2384aed332aebd2189f89b754d259a2a77" ], "author": { "name": "Kyeongkab.Nam", "email": "Kyeongkab.Nam@sony.com", "time": "Fri Jan 13 02:42:39 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 13 02:42:39 2023 +0000" }, "message": "Fix a test to check duplicated phandles am: 718007765a am: bc2c5f2384\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2385752\n\nChange-Id: Id9e3e33501130aba193bcbd7135e7d8b35b158ee\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bc2c5f2384aed332aebd2189f89b754d259a2a77", "tree": "f9da7afffdc50c4db4ed059e0537def72328022e", "parents": [ "38fdfacee637fb180d1e671640d7afaddc8877c6", "718007765a13fdeabae3c9286877ef6455a0940c" ], "author": { "name": "Kyeongkab.Nam", "email": "Kyeongkab.Nam@sony.com", "time": "Fri Jan 13 02:11:42 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 13 02:11:42 2023 +0000" }, "message": "Fix a test to check duplicated phandles am: 718007765a\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2385752\n\nChange-Id: I909be551c58c7891716a4f53fcb8c2eceef6fd52\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0dc1efa4ca1f7a11e9f9e7ac4335300999f980ef", "tree": "de4f284f37773e18eb7a68a4edadac56b895bb7f", "parents": [ "ea682bf4a21b3fa34c4204b228a38f4bf6c7317f", "13f2d8922efbb7d991956d079b709c0681a7c21a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jan 11 22:47:37 2023 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jan 11 22:47:37 2023 -0800" }, "message": "Merge tm-qpr-dev-plus-aosp-without-vendor@9467136\n\nBug: 264720040\nMerged-In: I03a56f68a7e53d941809560b943153b8fc31decc\nChange-Id: I8a512991e20e7652e9d9bc7338c951d8dd34e2b7\n" }, { "commit": "718007765a13fdeabae3c9286877ef6455a0940c", "tree": "f9da7afffdc50c4db4ed059e0537def72328022e", "parents": [ "38fdfacee637fb180d1e671640d7afaddc8877c6" ], "author": { "name": "Kyeongkab.Nam", "email": "Kyeongkab.Nam@sony.com", "time": "Wed Nov 30 04:33:32 2022 +0900" }, "committer": { "name": "Kyeongkab Nam", "email": "Kyeongkab.Nam@sony.com", "time": "Thu Jan 12 04:02:01 2023 +0000" }, "message": "Fix a test to check duplicated phandles\n\nAll the dtbo will be merged into one fdt to verify if dtb in a test\ndevice is the same as expected.\nHowever, there are cases the number of phandle will be\nduplicated\nFix a test to get correct phandle_offset.\n\nBug: 259891464\nTest: run vts -m VtsFirmwareDtboVerification\nChange-Id: Ia90a4537a4be0dfbb0316d2b47fb12d619fa7c34\n(cherry picked from commit 7bcbff31c5af60933701281d5e682e62732143d8)\n" }, { "commit": "dd5fec1f0eeff01efc3181e80ed8352d81a2ee3e", "tree": "6be3d67abeca7a3f922de2b7cdb1d08b8da42c9d", "parents": [ "ec575f31e9732d68985ca5c14aa8962b65bd15ed", "13f2d8922efbb7d991956d079b709c0681a7c21a" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jan 05 07:05:37 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 05 07:05:37 2023 +0000" }, "message": "Merge \"Fix a test to check duplicated phandles\" am: c63cf42770 am: ea682bf4a2 am: 13f2d8922e\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2321129\n\nChange-Id: Ie92feca313a3d42582e9ce145905524a40909131\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "13f2d8922efbb7d991956d079b709c0681a7c21a", "tree": "de4f284f37773e18eb7a68a4edadac56b895bb7f", "parents": [ "b23a6fe0e1c64bcb8071db925eb4162fb400fd06", "ea682bf4a21b3fa34c4204b228a38f4bf6c7317f" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jan 05 06:28:57 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 05 06:28:57 2023 +0000" }, "message": "Merge \"Fix a test to check duplicated phandles\" am: c63cf42770 am: ea682bf4a2\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2321129\n\nChange-Id: I1b596a84e5c66529028faff8dfa9de2a53316d90\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ea682bf4a21b3fa34c4204b228a38f4bf6c7317f", "tree": "5141389bae83959a988b943fd180b992b4977e12", "parents": [ "d591b83a4a09d3310a6914f285a3173527a281bc", "c63cf42770a950d01cab196cbc92360880a2a83a" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jan 05 05:55:44 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 05 05:55:44 2023 +0000" }, "message": "Merge \"Fix a test to check duplicated phandles\" am: c63cf42770\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2321129\n\nChange-Id: Ic0d8731f6598cd939329478445223c515e4e25ee\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c63cf42770a950d01cab196cbc92360880a2a83a", "tree": "5141389bae83959a988b943fd180b992b4977e12", "parents": [ "267a5b5e2bfc8cead322d7e5e49014cfbce6d960", "7bcbff31c5af60933701281d5e682e62732143d8" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jan 05 05:29:55 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jan 05 05:29:55 2023 +0000" }, "message": "Merge \"Fix a test to check duplicated phandles\"" }, { "commit": "ec575f31e9732d68985ca5c14aa8962b65bd15ed", "tree": "f75d9f727d15fb193da062e4a3d332da40aadcab", "parents": [ "88bf3affeb3df7c119297f44723136e1c7f54f17", "b23a6fe0e1c64bcb8071db925eb4162fb400fd06" ], "author": { "name": "Mike McTernan", "email": "mikemcternan@google.com", "time": "Tue Jan 03 23:36:28 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jan 03 23:36:28 2023 +0000" }, "message": "[automerger skipped] Merge \"libufdt: don\u0027t overflow when handling propeties \u003e INT_MAX in size\" into tm-qpr-dev am: b3a49bc3b7 am: b23a6fe0e1 -s ours\n\nam skip reason: Merged-In I03a56f68a7e53d941809560b943153b8fc31decc with SHA-1 4f875b5cc1 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/20759190\n\nChange-Id: I2f04a354ec92fbd455ddc5fdd719ae297b2806bc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "88bf3affeb3df7c119297f44723136e1c7f54f17", "tree": "f75d9f727d15fb193da062e4a3d332da40aadcab", "parents": [ "d07d552dea8cf0bbd319d852af911c141504a840", "6bc9ce897bee7e9796f1487b73b7dca5c8b841fd" ], "author": { "name": "Mike McTernan", "email": "mikemcternan@google.com", "time": "Tue Jan 03 23:36:19 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jan 03 23:36:19 2023 +0000" }, "message": "Merge \"libufdt: tests: Check input file integrity before parsing.\" into tm-qpr-dev am: d8c0959c92 am: 6bc9ce897b\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/20805389\n\nChange-Id: I06fc49a25623820cda758cf7783c0920e379de4d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d07d552dea8cf0bbd319d852af911c141504a840", "tree": "f75d9f727d15fb193da062e4a3d332da40aadcab", "parents": [ "f82b43f7e2e88797a604778c05798cf099ea6c7a", "567c946742607e0b82607ea929781e8f6a52379a" ], "author": { "name": "Mike McTernan", "email": "mikemcternan@google.com", "time": "Tue Jan 03 23:35:16 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jan 03 23:35:16 2023 +0000" }, "message": "Merge \"libufdt: extract_dtb: Check tree is valid before extraction.\" into tm-qpr-dev am: 393b236d10 am: 567c946742\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/20805155\n\nChange-Id: Ie2c18f5545066170d4e296e77ff9adc46779c44c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b23a6fe0e1c64bcb8071db925eb4162fb400fd06", "tree": "19e07f8cb758402b8e8bb3df1c42ad7461b7f5d0", "parents": [ "6bc9ce897bee7e9796f1487b73b7dca5c8b841fd", "b3a49bc3b7735690cead723f7dc3feea05e3de87" ], "author": { "name": "Mike McTernan", "email": "mikemcternan@google.com", "time": "Tue Jan 03 23:15:36 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jan 03 23:15:36 2023 +0000" }, "message": "Merge \"libufdt: don\u0027t overflow when handling propeties \u003e INT_MAX in size\" into tm-qpr-dev am: b3a49bc3b7\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/20759190\n\nChange-Id: Id5499c0b895f8f4558e4eb6007887cf0dfe4d0cb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6bc9ce897bee7e9796f1487b73b7dca5c8b841fd", "tree": "775845ab869f4d25b759abe193f898d58c86f35a", "parents": [ "567c946742607e0b82607ea929781e8f6a52379a", "d8c0959c92310c7c649435e4057c41a6b9ba7b91" ], "author": { "name": "Mike McTernan", "email": "mikemcternan@google.com", "time": "Tue Jan 03 23:15:05 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jan 03 23:15:05 2023 +0000" }, "message": "Merge \"libufdt: tests: Check input file integrity before parsing.\" into tm-qpr-dev am: d8c0959c92\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/20805389\n\nChange-Id: If767e4ad6fa7682611d1171dec1c561a7adf3976\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "567c946742607e0b82607ea929781e8f6a52379a", "tree": "b291086daee434c1eb73526049137703c4bc449e", "parents": [ "1a9d8554429f172ec76b808c21771f40f901f47f", "393b236d1070e080025fbca1692446368290d91f" ], "author": { "name": "Mike McTernan", "email": "mikemcternan@google.com", "time": "Tue Jan 03 23:14:54 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jan 03 23:14:54 2023 +0000" }, "message": "Merge \"libufdt: extract_dtb: Check tree is valid before extraction.\" into tm-qpr-dev am: 393b236d10\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/20805155\n\nChange-Id: I3f82cb046f7d7a5195e6324d89a6c92bd20903be\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b3a49bc3b7735690cead723f7dc3feea05e3de87", "tree": "ed69e4b25d9a889dc1a08159927a9ff49deb2555", "parents": [ "d8c0959c92310c7c649435e4057c41a6b9ba7b91", "cd47b8f445d1f81aea3f21b2a87fe7f8dd6b899b" ], "author": { "name": "Mike McTernan", "email": "mikemcternan@google.com", "time": "Tue Jan 03 21:42:33 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 03 21:42:33 2023 +0000" }, "message": "Merge \"libufdt: don\u0027t overflow when handling propeties \u003e INT_MAX in size\" into tm-qpr-dev" }, { "commit": "d8c0959c92310c7c649435e4057c41a6b9ba7b91", "tree": "ab38469f6718f062e4ccda583edd82d57fc9b180", "parents": [ "393b236d1070e080025fbca1692446368290d91f", "0e616a658c40b2f9986e907552af67c19a2ce9e8" ], "author": { "name": "Mike McTernan", "email": "mikemcternan@google.com", "time": "Tue Jan 03 21:42:26 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 03 21:42:26 2023 +0000" }, "message": "Merge \"libufdt: tests: Check input file integrity before parsing.\" into tm-qpr-dev" }, { "commit": "393b236d1070e080025fbca1692446368290d91f", "tree": "1c3b5bdd04b6d8753ac7f64afe7e029d5655d0e9", "parents": [ "d68b0549f42900c6c1d081526147e310e5cc4933", "794064884c9fbf59951f4ab11df1e8cd841eafe3" ], "author": { "name": "Mike McTernan", "email": "mikemcternan@google.com", "time": "Tue Jan 03 21:42:16 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 03 21:42:16 2023 +0000" }, "message": "Merge \"libufdt: extract_dtb: Check tree is valid before extraction.\" into tm-qpr-dev" }, { "commit": "cd47b8f445d1f81aea3f21b2a87fe7f8dd6b899b", "tree": "9e2f112753fcf5ffd339f07ea09b6287a9e33775", "parents": [ "d68b0549f42900c6c1d081526147e310e5cc4933" ], "author": { "name": "Mike McTernan", "email": "mikemcternan@google.com", "time": "Fri Dec 16 14:42:05 2022 +0000" }, "committer": { "name": "Mike McTernan", "email": "mikemcternan@google.com", "time": "Fri Dec 23 11:41:22 2022 +0000" }, "message": "libufdt: don\u0027t overflow when handling propeties \u003e INT_MAX in size\n\nEnsure property sizes (read as uint32_t) don\u0027t overflow the int return\nvalue when being read. Fix up _ufdt_output_property_to_fdt() to avoid\nint overflow if a property len is near INT_MAX in size.\n\nBug: 259062118\nIgnore-AOSP-First: Security\nTest: mmma system/libufdt\nTest: system/libufdt/tests/run_tests.sh\nTest: system/libufdt/tests/run_performance_test.sh\nChange-Id: I03a56f68a7e53d941809560b943153b8fc31decc\nMerged-In: I03a56f68a7e53d941809560b943153b8fc31decc\n" }, { "commit": "f82b43f7e2e88797a604778c05798cf099ea6c7a", "tree": "f75d9f727d15fb193da062e4a3d332da40aadcab", "parents": [ "0fd93860247e7f4eaae1c53eef160a0782a578c5", "1a9d8554429f172ec76b808c21771f40f901f47f" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Dec 22 18:12:32 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 22 18:12:32 2022 +0000" }, "message": "[automerger skipped] libufdt: Fix possible null pointer access if test program is fed bad input. am: d68b0549f4 -s ours am: 1a9d855442 -s ours\n\nam skip reason: Merged-In I4b9bb58037fc236852529c944d36c4e51e4c43fa with SHA-1 f9100fd2e8 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/20747473\n\nChange-Id: I2fa0f68374ceaad391fbd8615c140101fb3a081f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0e616a658c40b2f9986e907552af67c19a2ce9e8", "tree": "0f25a51a8b3b6861a8f4293f227cccbef3331a8d", "parents": [ "d68b0549f42900c6c1d081526147e310e5cc4933" ], "author": { "name": "Mike McTernan", "email": "mikemcternan@google.com", "time": "Fri Dec 16 11:58:05 2022 +0000" }, "committer": { "name": "Mike McTernan", "email": "mikemcternan@google.com", "time": "Thu Dec 22 17:30:42 2022 +0000" }, "message": "libufdt: tests: Check input file integrity before parsing.\n\nThis prevents malformed input causing the tests to crash, misbehave or fail if there is not enough memory to contain them.\n\nIgnore-AOSP-First: Security\nBug: 260569699\nTest: mma system/libufdt\nTest: system/libufdt/tests/run_tests.sh\nTest: system/libufdt/tests/run_performance_test.sh\nChange-Id: I89df0d33b5f6b5b9484a9b79534ab5163d184e3f\n(cherry picked from commit 0750fc213182630aa6a4b2156a8beab8a75495c8)\n" }, { "commit": "1a9d8554429f172ec76b808c21771f40f901f47f", "tree": "c7b0413048af9fb6cb837af3188dd9e813d0ef98", "parents": [ "92dd266365e966ea010c058fa4240d57eeaaced5", "d68b0549f42900c6c1d081526147e310e5cc4933" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Dec 22 17:15:11 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 22 17:15:11 2022 +0000" }, "message": "[automerger skipped] libufdt: Fix possible null pointer access if test program is fed bad input. am: d68b0549f4 -s ours\n\nam skip reason: Merged-In I4b9bb58037fc236852529c944d36c4e51e4c43fa with SHA-1 f9100fd2e8 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/20747473\n\nChange-Id: Ie5ab617dd144cd44b07aa5ae9d8010f0e58bed45\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d68b0549f42900c6c1d081526147e310e5cc4933", "tree": "28184f23189cf7fa25c1951c8c26a9148b71ad8a", "parents": [ "46493e9936878b033ca4056486054ca8432a806e" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Dec 02 04:12:45 2022 +0000" }, "committer": { "name": "Mike McTernan", "email": "mikemcternan@google.com", "time": "Thu Dec 22 14:59:47 2022 +0000" }, "message": "libufdt: Fix possible null pointer access if test program is fed bad input.\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2322015\n\nBug: 259062118\nChange-Id: I2906fadcb930a1e8313667d03518b2db4f9b12bd\n(cherry picked from commit 2361be57bac9a7fc5671dbcd4cdd0b1e1fda9c9c)\nMerged-In: I2906fadcb930a1e8313667d03518b2db4f9b12bd\nMerged-In: I4b9bb58037fc236852529c944d36c4e51e4c43fa\nMerged-In: I7be1d654b2f8934df58ef03f6a500438ef14dcac\nMerged-In: I3636732b7a6b2846b05f7de47c23e3246a916dd2\n" }, { "commit": "0fd93860247e7f4eaae1c53eef160a0782a578c5", "tree": "f75d9f727d15fb193da062e4a3d332da40aadcab", "parents": [ "588867b24efeb4f3cfe2fcc1cce1a33db0f58916", "4f875b5cc1694c1e7d1a236a11dc0226ca85ebf4" ], "author": { "name": "Mike McTernan", "email": "mikemcternan@google.com", "time": "Thu Dec 22 08:57:13 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 22 08:57:13 2022 +0000" }, "message": "Merge \"libufdt: don\u0027t overflow when handling propeties \u003e INT_MAX in size\"" }, { "commit": "794064884c9fbf59951f4ab11df1e8cd841eafe3", "tree": "a0a040fa063f99376a6da93d73076e2c56d511f0", "parents": [ "46493e9936878b033ca4056486054ca8432a806e" ], "author": { "name": "Mike McTernan", "email": "mikemcternan@google.com", "time": "Fri Dec 16 17:20:25 2022 +0000" }, "committer": { "name": "Mike McTernan", "email": "mikemcternan@google.com", "time": "Thu Dec 22 08:38:50 2022 +0000" }, "message": "libufdt: extract_dtb: Check tree is valid before extraction.\n\nIgnore-AOSP-First: Security\nBug: 261442369\nTest: mmma system/libufdt\nTest: extract_dtb with corrupt tree in image\nTest: extract_dtb with valid trees in image\nTest: system/libufdt/tests/run_tests.sh\nChange-Id: I3d2b29e815323c1d8d3d0d2087ce70d04ab35df4\n(cherry picked from commit f2e86523500a4346065e109223dc2c6124188413)\n" }, { "commit": "588867b24efeb4f3cfe2fcc1cce1a33db0f58916", "tree": "f4974b4a8f83c6cbe1dcf50f0a0a3efc0b081967", "parents": [ "0750fc213182630aa6a4b2156a8beab8a75495c8", "f2e86523500a4346065e109223dc2c6124188413" ], "author": { "name": "Mike McTernan", "email": "mikemcternan@google.com", "time": "Thu Dec 22 08:38:19 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 22 08:38:19 2022 +0000" }, "message": "Merge \"libufdt: extract_dtb: Check tree is valid before extraction.\"" } ], "next": "f2e86523500a4346065e109223dc2c6124188413" }