)]}' { "log": [ { "commit": "aef2939781fc0b57b4477df7160935cdf5697919", "tree": "6e2c5f30d8fb68dbfa7b0e36388a10697b755743", "parents": [ "aa4fbfd5b8b9c91d5d8f9e44bf69fb33e97a555f", "a6418dc3c512af06275bd65016fadf21bc71c664" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Dec 20 07:48:02 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 20 07:48:02 2024 -0800" }, "message": "Merge \"Fix the UB in assignment + noexcepts\" into main am: a6418dc3c5\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/3427926\n\nChange-Id: Ic1cd2f56b9c3c70bd2fa02c38f38753e86c25994\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a6418dc3c512af06275bd65016fadf21bc71c664", "tree": "6e2c5f30d8fb68dbfa7b0e36388a10697b755743", "parents": [ "06f06a57207180e90300c6362321e3e4242eca35", "9be44a65621826a8c3acc5d694ad7f65f60a9813" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Dec 20 07:22:30 2024 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Dec 20 07:22:30 2024 -0800" }, "message": "Merge \"Fix the UB in assignment + noexcepts\" into main" }, { "commit": "9be44a65621826a8c3acc5d694ad7f65f60a9813", "tree": "6e2c5f30d8fb68dbfa7b0e36388a10697b755743", "parents": [ "06f06a57207180e90300c6362321e3e4242eca35" ], "author": { "name": "Yurii Zubrytskyi", "email": "zyy@google.com", "time": "Thu Dec 19 21:10:48 2024 -0800" }, "committer": { "name": "Yurii Zubrytskyi", "email": "zyy@google.com", "time": "Thu Dec 19 21:11:22 2024 -0800" }, "message": "Fix the UB in assignment + noexcepts\n\nCalling a dtor without constructing the object back is a UB,\nthis CL changes that to have a separate non-dtor method to call\n\n+ add noexcept everywhere as this class doesn\u0027t throw\n\nTest: build + boot\nFlag: EXEMPT minor bugfix\nChange-Id: I06aa2e1c94ec6dcf7474fcaf1fc77e36104f0ef1\n" }, { "commit": "aa4fbfd5b8b9c91d5d8f9e44bf69fb33e97a555f", "tree": "1b1cdee8d9cea4d81ec492693c4976090eafecdd", "parents": [ "8bcee9efeff3ba110830927a5fb6e6bd432578f3", "06f06a57207180e90300c6362321e3e4242eca35" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Nov 14 11:56:55 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Nov 14 11:56:55 2024 +0000" }, "message": "Merge \"Allow loading libartd.so instead of libart.so with ART_TEST_ON_VM\u003dtrue.\" into main am: 4d8dd218eb am: 06f06a5720\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/3351018\n\nChange-Id: I332bb3545443d44e218d6b2f469aa0e9b535e7f3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "06f06a57207180e90300c6362321e3e4242eca35", "tree": "1b1cdee8d9cea4d81ec492693c4976090eafecdd", "parents": [ "c01773efcb682832e30888bf9266ef5c833e171a", "4d8dd218eb5342ffc22281bdcc1f3ea86c1da8ce" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Nov 14 11:44:36 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Nov 14 11:44:36 2024 +0000" }, "message": "Merge \"Allow loading libartd.so instead of libart.so with ART_TEST_ON_VM\u003dtrue.\" into main am: 4d8dd218eb\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/3351018\n\nChange-Id: I4ac6f87d0bb271dcdf815fdcc600ab6be2803926\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4d8dd218eb5342ffc22281bdcc1f3ea86c1da8ce", "tree": "1b1cdee8d9cea4d81ec492693c4976090eafecdd", "parents": [ "e8a07933449c7b0194994b98a9f361bd9883f2d7", "8136202e604216d71bedc68df54f87ef9e225102" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Nov 14 11:27:44 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Nov 14 11:27:44 2024 +0000" }, "message": "Merge \"Allow loading libartd.so instead of libart.so with ART_TEST_ON_VM\u003dtrue.\" into main" }, { "commit": "8136202e604216d71bedc68df54f87ef9e225102", "tree": "1b1cdee8d9cea4d81ec492693c4976090eafecdd", "parents": [ "e8a07933449c7b0194994b98a9f361bd9883f2d7" ], "author": { "name": "Ulya Trofimovich", "email": "skvadrik@google.com", "time": "Thu Nov 14 09:50:02 2024 +0000" }, "committer": { "name": "Ulya Trofimovich", "email": "skvadrik@google.com", "time": "Thu Nov 14 09:55:05 2024 +0000" }, "message": "Allow loading libartd.so instead of libart.so with ART_TEST_ON_VM\u003dtrue.\n\nDon\u0027t query system properties if environment variable ART_TEST_ON_VM is\nset, as there are no system properties on VM (it\u0027s a Linux chroot, not\nAndroid). This allows one to run ART tests in debug mode.\n\nTest: run ART test 1924 in debug mode (previously it used to fail with\n `globals_unix.cc:59 Loading libartbased.so while libartbase.so is\n already loaded`, now it pesses):\n\n export SOONG_ALLOW_MISSING_DEPENDENCIES\u003dtrue\n export ART_TEST_SSH_USER\u003dubuntu\n export ART_TEST_SSH_HOST\u003dlocalhost\n export ART_TEST_SSH_PORT\u003d10001\n export ART_TEST_ON_VM\u003dtrue\n\n . ./build/envsetup.sh\n lunch armv8-trunk_staging-eng\n art/tools/buildbot-build.sh --target -j72 #--installclean\n\n . art/tools/buildbot-utils.sh\n art/tools/buildbot-cleanup-device.sh\n art/tools/buildbot-setup-device.sh\n art/tools/buildbot-sync.sh\n\n art/test/run-test --chroot $ART_TEST_CHROOT --64 1924\n\nChange-Id: I9a574979a4890c09ef5c2d7f15ce03b7769bb93b\n" }, { "commit": "8bcee9efeff3ba110830927a5fb6e6bd432578f3", "tree": "13193b8ceb4728a3a05cd1570ab64735f1772e4b", "parents": [ "031d0de8de9f3cf34fd0f054809595b9f7ee9f60", "c01773efcb682832e30888bf9266ef5c833e171a" ], "author": { "name": "Jerome Gaillard", "email": "jgaillard@google.com", "time": "Wed Oct 30 16:54:31 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 30 16:54:31 2024 +0000" }, "message": "Merge \"Add Windows definitions for JNIEXPORT and JNIIMPORT\" into main am: e8a0793344 am: c01773efcb\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/3325175\n\nChange-Id: I1a91d87012c57baf1ff80be229d6d79d026b9df8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c01773efcb682832e30888bf9266ef5c833e171a", "tree": "13193b8ceb4728a3a05cd1570ab64735f1772e4b", "parents": [ "031d0de8de9f3cf34fd0f054809595b9f7ee9f60", "e8a07933449c7b0194994b98a9f361bd9883f2d7" ], "author": { "name": "Jerome Gaillard", "email": "jgaillard@google.com", "time": "Wed Oct 30 16:34:34 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 30 16:34:34 2024 +0000" }, "message": "Merge \"Add Windows definitions for JNIEXPORT and JNIIMPORT\" into main am: e8a0793344\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/3325175\n\nChange-Id: I8d2acfa28caa605d1a31c504293fd67deb922e63\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e8a07933449c7b0194994b98a9f361bd9883f2d7", "tree": "13193b8ceb4728a3a05cd1570ab64735f1772e4b", "parents": [ "8717a16cc6b9c4fd3401262a95d107dd6f6b8f3c", "a16d4b5aa36cb5c200635aaa53f7acf443572ec1" ], "author": { "name": "Jerome Gaillard", "email": "jgaillard@google.com", "time": "Wed Oct 30 16:17:10 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Oct 30 16:17:10 2024 +0000" }, "message": "Merge \"Add Windows definitions for JNIEXPORT and JNIIMPORT\" into main" }, { "commit": "a16d4b5aa36cb5c200635aaa53f7acf443572ec1", "tree": "13193b8ceb4728a3a05cd1570ab64735f1772e4b", "parents": [ "8717a16cc6b9c4fd3401262a95d107dd6f6b8f3c" ], "author": { "name": "Jerome Gaillard", "email": "jgaillard@google.com", "time": "Wed Oct 30 11:58:09 2024 +0000" }, "committer": { "name": "Jerome Gaillard", "email": "jgaillard@google.com", "time": "Wed Oct 30 15:47:48 2024 +0000" }, "message": "Add Windows definitions for JNIEXPORT and JNIIMPORT\n\nWindows has a specific way of exposing symbols for export and this needs\nto be reflected in the defintions of JNIIMPORT and JNIEXPORT.\nThis also adds JNIEXPORT to methods definitions in file_descriptor_jni.h\nto match with the way they are implemented.\n\nBug: 340885449\nTest: lunch sdk_phone64_arm64-trunk_staging-eng \u0026\u0026 m libandroid_runtime\n on a linux host to compile libandroid_runtime.dll\n\nChange-Id: Ie23c1e9db28c4903ca52599fb550d0d2f06acd4b\n" }, { "commit": "031d0de8de9f3cf34fd0f054809595b9f7ee9f60", "tree": "3434b5fbddfc3cabadb8e1551c5e901716f3f266", "parents": [ "3c615fd5459791a309e40ab6619838ca9d5283a8", "8717a16cc6b9c4fd3401262a95d107dd6f6b8f3c" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Aug 08 08:55:07 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 08 08:55:07 2024 +0000" }, "message": "Merge \"Add ScopedCriticalArray to nativehelper.\" into main am: 9e5628264b am: 8717a16cc6\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/3206051\n\nChange-Id: I309585e9c52b00cc814ed55e0ee90652fec7f09b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8717a16cc6b9c4fd3401262a95d107dd6f6b8f3c", "tree": "3434b5fbddfc3cabadb8e1551c5e901716f3f266", "parents": [ "3c615fd5459791a309e40ab6619838ca9d5283a8", "9e5628264b2c6399dde0ff2524c5a413a2718b74" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Aug 08 08:31:29 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 08 08:31:29 2024 +0000" }, "message": "Merge \"Add ScopedCriticalArray to nativehelper.\" into main am: 9e5628264b\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/3206051\n\nChange-Id: Ie419b4f8f127f4388a4eef9fd9dd696d3f33506d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9e5628264b2c6399dde0ff2524c5a413a2718b74", "tree": "3434b5fbddfc3cabadb8e1551c5e901716f3f266", "parents": [ "e82f3c4404bd993240d08989537ec6f3f0086b6a", "9550d7eaedb4098000ee919cd3d99d8929e4b41d" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Aug 08 08:14:45 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 08 08:14:45 2024 +0000" }, "message": "Merge \"Add ScopedCriticalArray to nativehelper.\" into main" }, { "commit": "9550d7eaedb4098000ee919cd3d99d8929e4b41d", "tree": "3434b5fbddfc3cabadb8e1551c5e901716f3f266", "parents": [ "e82f3c4404bd993240d08989537ec6f3f0086b6a" ], "author": { "name": "John Wu", "email": "topjohnwu@google.com", "time": "Wed Aug 07 23:00:47 2024 +0000" }, "committer": { "name": "John Wu", "email": "topjohnwu@google.com", "time": "Wed Aug 07 23:00:47 2024 +0000" }, "message": "Add ScopedCriticalArray to nativehelper.\n\nAdd helper class around PrimitiveArrayCritical APIs\n\nBug: 339614874\nTest: Built locally with internal framework code changes\nChange-Id: I004d5696ff33253f771776427ba263c87d65d012\n" }, { "commit": "3c615fd5459791a309e40ab6619838ca9d5283a8", "tree": "4503ad2c3540eec13111a442aab50bed39aa65f9", "parents": [ "a952590545028cc76690910319f7d74d7e02884b", "e82f3c4404bd993240d08989537ec6f3f0086b6a" ], "author": { "name": "Jerome Gaillard", "email": "jgaillard@google.com", "time": "Fri May 17 18:29:08 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri May 17 18:29:08 2024 +0000" }, "message": "Merge \"Make a host JVM compatible version of libnativehelper\" into main am: e5ddaeeccb am: e82f3c4404\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/3086065\n\nChange-Id: Id9f2b92fce30b27828452ceebe3f848e4f5aba32\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e82f3c4404bd993240d08989537ec6f3f0086b6a", "tree": "4503ad2c3540eec13111a442aab50bed39aa65f9", "parents": [ "419b11eaf09867540a3114d9e2466fc988d1b93e", "e5ddaeeccb966b40f388f0e578e5959908be8a9f" ], "author": { "name": "Jerome Gaillard", "email": "jgaillard@google.com", "time": "Fri May 17 18:12:32 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri May 17 18:12:32 2024 +0000" }, "message": "Merge \"Make a host JVM compatible version of libnativehelper\" into main am: e5ddaeeccb\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/3086065\n\nChange-Id: I46b00b1e9a8f53eef6b4e1da3535d86a2bed90cd\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e5ddaeeccb966b40f388f0e578e5959908be8a9f", "tree": "4503ad2c3540eec13111a442aab50bed39aa65f9", "parents": [ "3dcba36aa77d40d15134dbf714beffb21f744808", "88c826d2c0b20f8c29e5549333c49fb824055e6a" ], "author": { "name": "Jerome Gaillard", "email": "jgaillard@google.com", "time": "Fri May 17 17:56:35 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri May 17 17:56:35 2024 +0000" }, "message": "Merge \"Make a host JVM compatible version of libnativehelper\" into main" }, { "commit": "88c826d2c0b20f8c29e5549333c49fb824055e6a", "tree": "4503ad2c3540eec13111a442aab50bed39aa65f9", "parents": [ "3dcba36aa77d40d15134dbf714beffb21f744808" ], "author": { "name": "Jerome Gaillard", "email": "jgaillard@google.com", "time": "Fri May 17 13:03:25 2024 +0100" }, "committer": { "name": "Jerome Gaillard", "email": "jgaillard@google.com", "time": "Fri May 17 17:20:16 2024 +0100" }, "message": "Make a host JVM compatible version of libnativehelper\n\nThis extracts the part of libnativehelper that is compatible with ART\nand JVM into a separate library. This library will be used to create a\nJVM variant of libnativehelper to link against in host builds of\nlibhwui/libandroid_runtime.\n\nBug: 322360037\nTest: N/A\nChange-Id: I37182e54a0cc965374007c98dd6b45034480d7ba\n" }, { "commit": "a952590545028cc76690910319f7d74d7e02884b", "tree": "8045fbe4244e5e39c75d51d981a908eac66e4b8d", "parents": [ "97e1de7dc2b73396fa541e2d3dc49d33a033eb3e", "419b11eaf09867540a3114d9e2466fc988d1b93e" ], "author": { "name": "Martin Stjernholm", "email": "mast@google.com", "time": "Mon May 13 14:15:46 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon May 13 14:15:46 2024 +0000" }, "message": "Merge \"Clean up source_build Soong config variables.\" into main am: 3dcba36aa7 am: 419b11eaf0\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/3076885\n\nChange-Id: Ifd03318ffcbaf685b54359b3d64a16ccce20294f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "419b11eaf09867540a3114d9e2466fc988d1b93e", "tree": "8045fbe4244e5e39c75d51d981a908eac66e4b8d", "parents": [ "17d150f7e224f54c7892849658bba6984dfe278a", "3dcba36aa77d40d15134dbf714beffb21f744808" ], "author": { "name": "Martin Stjernholm", "email": "mast@google.com", "time": "Mon May 13 13:55:37 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon May 13 13:55:37 2024 +0000" }, "message": "Merge \"Clean up source_build Soong config variables.\" into main am: 3dcba36aa7\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/3076885\n\nChange-Id: Id87d009500375f2c79f46f00922cc13b10a48c5d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3dcba36aa77d40d15134dbf714beffb21f744808", "tree": "8045fbe4244e5e39c75d51d981a908eac66e4b8d", "parents": [ "2580ffd41bc2c0aa5b69aabbab2ec3399b0f4528", "200fc7e420a6dbec4fbd17683ee3f97e33feb73c" ], "author": { "name": "Martin Stjernholm", "email": "mast@google.com", "time": "Mon May 13 13:19:05 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon May 13 13:19:05 2024 +0000" }, "message": "Merge \"Clean up source_build Soong config variables.\" into main" }, { "commit": "200fc7e420a6dbec4fbd17683ee3f97e33feb73c", "tree": "8045fbe4244e5e39c75d51d981a908eac66e4b8d", "parents": [ "2580ffd41bc2c0aa5b69aabbab2ec3399b0f4528" ], "author": { "name": "Martin Stjernholm", "email": "mast@google.com", "time": "Tue May 07 21:04:33 2024 +0100" }, "committer": { "name": "Martin Stjernholm", "email": "mast@google.com", "time": "Tue May 07 21:04:33 2024 +0100" }, "message": "Clean up source_build Soong config variables.\n\nThey no longer have any effect after the removal of the\nART_MODULE_BUILD_FROM_SOURCE build variable (b/308188056).\n\nTest: m nothing\nBug: 335854415\nChange-Id: I3c4590d30ce31a37032800a2b9738a7ce6dcd193\n" }, { "commit": "97e1de7dc2b73396fa541e2d3dc49d33a033eb3e", "tree": "b9fcaddf238448467faefb5fbeb4d8517ea21327", "parents": [ "6891bcc3434fdde1700f97442cf52183994c85c8", "17d150f7e224f54c7892849658bba6984dfe278a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 23:45:55 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 29 23:45:55 2024 +0000" }, "message": "[automerger skipped] Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future am: 17d150f7e2 -s ours\n\nam skip reason: Merged-In I9545d38e7a0f49882d1d36b85aff4b093c11e8d7 with SHA-1 4e9073c939 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/libnativehelper/+/27145277\n\nChange-Id: I46739907b216c71bafabbeeb88460ad122b45859\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "17d150f7e224f54c7892849658bba6984dfe278a", "tree": "b9fcaddf238448467faefb5fbeb4d8517ea21327", "parents": [ "d73de1fb10ac09f612b11b4229f4bb343f5ed5bc", "ddcbe3ce5c88405ce4e2dd5b9d5f0484852ece57" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 11:51:57 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 11:51:57 2024 -0700" }, "message": "Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future\n\nBug: 337098550\nMerged-In: I9545d38e7a0f49882d1d36b85aff4b093c11e8d7\nChange-Id: Iddbfc7937fffa1e5b88a6b5f715cc6c7774622f3\n" }, { "commit": "6891bcc3434fdde1700f97442cf52183994c85c8", "tree": "b9fcaddf238448467faefb5fbeb4d8517ea21327", "parents": [ "21a786787480367bd0640c4936f3a678baa1f74c", "d73de1fb10ac09f612b11b4229f4bb343f5ed5bc" ], "author": { "name": "Martin Stjernholm", "email": "mast@google.com", "time": "Mon Apr 22 13:35:44 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 22 13:35:44 2024 +0000" }, "message": "Merge \"Set test ownership.\" into main am: 2580ffd41b am: d73de1fb10\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/3048732\n\nChange-Id: I338a806e0295254382a8c59fd980ee1ea149de14\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d73de1fb10ac09f612b11b4229f4bb343f5ed5bc", "tree": "b9fcaddf238448467faefb5fbeb4d8517ea21327", "parents": [ "917f1253d11f79dc6b78710bf034743504777cc7", "2580ffd41bc2c0aa5b69aabbab2ec3399b0f4528" ], "author": { "name": "Martin Stjernholm", "email": "mast@google.com", "time": "Mon Apr 22 13:22:52 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 22 13:22:52 2024 +0000" }, "message": "Merge \"Set test ownership.\" into main am: 2580ffd41b\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/3048732\n\nChange-Id: Ifdeac9f1a787b44a1e88845e29cc59c77d598908\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2580ffd41bc2c0aa5b69aabbab2ec3399b0f4528", "tree": "b9fcaddf238448467faefb5fbeb4d8517ea21327", "parents": [ "8a1436725a9f662dcb4dd674bda27af5c4bfc03b", "28f1af5aadcfdb3fe3581065ac2e21541295b260" ], "author": { "name": "Martin Stjernholm", "email": "mast@google.com", "time": "Mon Apr 22 13:07:43 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Apr 22 13:07:43 2024 +0000" }, "message": "Merge \"Set test ownership.\" into main" }, { "commit": "28f1af5aadcfdb3fe3581065ac2e21541295b260", "tree": "b9fcaddf238448467faefb5fbeb4d8517ea21327", "parents": [ "8a1436725a9f662dcb4dd674bda27af5c4bfc03b" ], "author": { "name": "Martin Stjernholm", "email": "mast@google.com", "time": "Thu Apr 18 15:26:44 2024 +0100" }, "committer": { "name": "Martin Stjernholm", "email": "mast@google.com", "time": "Thu Apr 18 15:28:20 2024 +0100" }, "message": "Set test ownership.\n\nTest: presumbits\nBug: 333696887\nChange-Id: I41bfe7befbdd10f3799b27259faed252cc970596\n" }, { "commit": "21a786787480367bd0640c4936f3a678baa1f74c", "tree": "15b0900857bbc871a506782d0c1e1f1fa9125ca1", "parents": [ "ddcbe3ce5c88405ce4e2dd5b9d5f0484852ece57", "917f1253d11f79dc6b78710bf034743504777cc7" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Wed Mar 13 12:05:58 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 13 12:05:58 2024 +0000" }, "message": "Merge \"Move tests in libnativehelper_test.cpp out of tests_mts.\" into main am: 8a1436725a am: 917f1253d1\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2997936\n\nChange-Id: I2d0ca17f793d53f5bf2b1abce2508c5c495da124\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "917f1253d11f79dc6b78710bf034743504777cc7", "tree": "15b0900857bbc871a506782d0c1e1f1fa9125ca1", "parents": [ "f75aeea03586279434cae7cca514aa01f2bf376f", "8a1436725a9f662dcb4dd674bda27af5c4bfc03b" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Wed Mar 13 11:23:36 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 13 11:23:36 2024 +0000" }, "message": "Merge \"Move tests in libnativehelper_test.cpp out of tests_mts.\" into main am: 8a1436725a\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2997936\n\nChange-Id: I49e57d3eb43ad9209ce906b0215e562bb776a1d1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8a1436725a9f662dcb4dd674bda27af5c4bfc03b", "tree": "15b0900857bbc871a506782d0c1e1f1fa9125ca1", "parents": [ "f75aeea03586279434cae7cca514aa01f2bf376f", "4c6039710998ceaec303f360a0f15930ef320111" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Wed Mar 13 10:51:03 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Mar 13 10:51:03 2024 +0000" }, "message": "Merge \"Move tests in libnativehelper_test.cpp out of tests_mts.\" into main" }, { "commit": "4c6039710998ceaec303f360a0f15930ef320111", "tree": "15b0900857bbc871a506782d0c1e1f1fa9125ca1", "parents": [ "f75aeea03586279434cae7cca514aa01f2bf376f" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Mon Mar 11 16:37:07 2024 +0000" }, "committer": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Tue Mar 12 14:45:37 2024 +0000" }, "message": "Move tests in libnativehelper_test.cpp out of tests_mts.\n\nAccording to tests_mts/README.md, only tests that cover the API surface\nshould be there.\n\nTest: LibnativehelperInternalTestCases\nChange-Id: I214965a004e80b863ef6c63231eff8e9e12e9f4a\n" }, { "commit": "ddcbe3ce5c88405ce4e2dd5b9d5f0484852ece57", "tree": "6876d60d12d727b6434e6d6117275e4c582897be", "parents": [ "0cd53a1df1cab0f57314937357e28dc62ba480a7", "f75aeea03586279434cae7cca514aa01f2bf376f" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Feb 19 16:36:04 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Feb 19 16:36:04 2024 +0000" }, "message": "Merge \"AFileDescriptor_setFd should invoke setInt$\" into main am: e322933c80 am: f75aeea035\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2967585\n\nChange-Id: I7fc34f0052823f3268f95ac917a585c1f59c296f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f75aeea03586279434cae7cca514aa01f2bf376f", "tree": "6876d60d12d727b6434e6d6117275e4c582897be", "parents": [ "38a719ca1341e957cbb68bbad55cd020defa4556", "e322933c80387d34cad2e5fe77155b8a491716f7" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Feb 19 15:54:01 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Feb 19 15:54:01 2024 +0000" }, "message": "Merge \"AFileDescriptor_setFd should invoke setInt$\" into main am: e322933c80\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2967585\n\nChange-Id: I9b37720cf338548ebbbbe3b4780f57c3e6ea71be\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e322933c80387d34cad2e5fe77155b8a491716f7", "tree": "6876d60d12d727b6434e6d6117275e4c582897be", "parents": [ "58ee62ed561ab8896acee4db0cbf1b057284a280", "b779a29c6da5400e05e05af3f4b890daed0b6369" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Feb 19 15:31:41 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Feb 19 15:31:41 2024 +0000" }, "message": "Merge \"AFileDescriptor_setFd should invoke setInt$\" into main" }, { "commit": "b779a29c6da5400e05e05af3f4b890daed0b6369", "tree": "81a0c186ba121c7b58adf858c936ef5b72c33016", "parents": [ "d762036b49779560ad9ef9e1d7b5d5eed53d2302" ], "author": { "name": "Victor Chang", "email": "vichang@google.com", "time": "Fri Feb 16 17:18:11 2024 +0000" }, "committer": { "name": "Victor Chang", "email": "vichang@google.com", "time": "Mon Feb 19 12:43:08 2024 +0000" }, "message": "AFileDescriptor_setFd should invoke setInt$\n\nModifying the descriptor field directly causes that other\nfields are not updated accordingly.\n\nBug: 270692319\nTest: atest CtsLibcoreOjTestCases:test.java.io\nChange-Id: I3cceab946ebfccd993289d59f142a6f5ec0eeaba\n" }, { "commit": "0cd53a1df1cab0f57314937357e28dc62ba480a7", "tree": "f32d3db8237182183db54737527c6b30869ee9f0", "parents": [ "2579f942e0a9b79e774f3ddd8c860a3ea03ef55f", "4e9073c93910b937abf3ec4e579fd6ecb228e1d1" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Fri Feb 16 12:33:18 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 16 12:33:18 2024 +0000" }, "message": "[automerger skipped] Add missing libc++ includes am: 4e9073c939 -s ours\n\nam skip reason: Merged-In I9545d38e7a0f49882d1d36b85aff4b093c11e8d7 with SHA-1 4ee79ecafb is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/libnativehelper/+/26267605\n\nChange-Id: Iceb323e0109312e2e353b433386a7ad932124630\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4e9073c93910b937abf3ec4e579fd6ecb228e1d1", "tree": "7d3aa94245d7cf163013906651bee72bf941ca45", "parents": [ "31a261d502eeac8ffe7b03829f2450c8fb794c9c" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Tue Jan 09 10:52:01 2024 -0800" }, "committer": { "name": "Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Fri Feb 16 06:03:23 2024 +0000" }, "message": "Add missing libc++ includes\n\nBug: 175635923\nTest: m MODULES-IN-libnativehelper\n(cherry picked from https://android-review.googlesource.com/q/commit:4ee79ecafb7194057b42f6783f9ae80d1a491061)\nMerged-In: I9545d38e7a0f49882d1d36b85aff4b093c11e8d7\nChange-Id: I9545d38e7a0f49882d1d36b85aff4b093c11e8d7\n" }, { "commit": "2579f942e0a9b79e774f3ddd8c860a3ea03ef55f", "tree": "f32d3db8237182183db54737527c6b30869ee9f0", "parents": [ "d251fdf5a338bad1f66b6523685b774d05f8f21b", "38a719ca1341e957cbb68bbad55cd020defa4556" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Feb 13 20:36:21 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 13 20:36:21 2024 +0000" }, "message": "Merge \"Migrate Test Targets to New Android Ownership Model\" into main am: 58ee62ed56 am: 38a719ca13\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2946392\n\nChange-Id: I8d7f0710bcbc9b60a14f63aacb6d4b6ca7f87fd7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "38a719ca1341e957cbb68bbad55cd020defa4556", "tree": "f32d3db8237182183db54737527c6b30869ee9f0", "parents": [ "05087690dc00b8156d90ad882df31196a0da173b", "58ee62ed561ab8896acee4db0cbf1b057284a280" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Feb 13 19:54:59 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 13 19:54:59 2024 +0000" }, "message": "Merge \"Migrate Test Targets to New Android Ownership Model\" into main am: 58ee62ed56\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2946392\n\nChange-Id: If401adb694c3483d208be718dfa758479bfb775d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "58ee62ed561ab8896acee4db0cbf1b057284a280", "tree": "f32d3db8237182183db54737527c6b30869ee9f0", "parents": [ "d762036b49779560ad9ef9e1d7b5d5eed53d2302", "b75b46b8a0068eb730303b796db1d75f79eec362" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Feb 13 19:08:03 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Feb 13 19:08:03 2024 +0000" }, "message": "Merge \"Migrate Test Targets to New Android Ownership Model\" into main" }, { "commit": "d251fdf5a338bad1f66b6523685b774d05f8f21b", "tree": "70dfa295d99133f67aa5009ef99a4326e7e0c51d", "parents": [ "2830ad755ddea88771f7e8659ffee24c31709af7", "05087690dc00b8156d90ad882df31196a0da173b" ], "author": { "name": "Martin Stjernholm", "email": "mast@google.com", "time": "Fri Feb 02 15:11:21 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 02 15:11:21 2024 +0000" }, "message": "Merge \"Make libnativehelper_compat_libc++ public.\" into main am: d762036b49 am: 05087690dc\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2943829\n\nChange-Id: I82677cd34750e8ff3e18da40ae6d6c47ccc9a3d6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "05087690dc00b8156d90ad882df31196a0da173b", "tree": "70dfa295d99133f67aa5009ef99a4326e7e0c51d", "parents": [ "2830ad755ddea88771f7e8659ffee24c31709af7", "d762036b49779560ad9ef9e1d7b5d5eed53d2302" ], "author": { "name": "Martin Stjernholm", "email": "mast@google.com", "time": "Fri Feb 02 14:31:08 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 02 14:31:08 2024 +0000" }, "message": "Merge \"Make libnativehelper_compat_libc++ public.\" into main am: d762036b49\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2943829\n\nChange-Id: I85d4820d2f6c08d0264ec76440017b18178ac1f5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d762036b49779560ad9ef9e1d7b5d5eed53d2302", "tree": "70dfa295d99133f67aa5009ef99a4326e7e0c51d", "parents": [ "7d70bc049d62500d457fe8be7ca4dff9542804d7", "cc5d3477cf5224b31dd07f806f2f0ed0038a67f2" ], "author": { "name": "Martin Stjernholm", "email": "mast@google.com", "time": "Fri Feb 02 13:59:06 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Feb 02 13:59:06 2024 +0000" }, "message": "Merge \"Make libnativehelper_compat_libc++ public.\" into main" }, { "commit": "b75b46b8a0068eb730303b796db1d75f79eec362", "tree": "29925dacd3dc889f553e01d6980120a6d88bd386", "parents": [ "7d70bc049d62500d457fe8be7ca4dff9542804d7" ], "author": { "name": "Aditya Choudhary", "email": "caditya@google.com", "time": "Fri Feb 02 13:56:18 2024 +0000" }, "committer": { "name": "Aditya Choudhary", "email": "caditya@google.com", "time": "Fri Feb 02 13:56:18 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: I0cc8123c117ac9eb5eab80827f9db5ba76584477\n" }, { "commit": "cc5d3477cf5224b31dd07f806f2f0ed0038a67f2", "tree": "70dfa295d99133f67aa5009ef99a4326e7e0c51d", "parents": [ "7d70bc049d62500d457fe8be7ca4dff9542804d7" ], "author": { "name": "Martin Stjernholm", "email": "mast@google.com", "time": "Thu Feb 01 14:01:48 2024 +0000" }, "committer": { "name": "Martin Stjernholm", "email": "mast@google.com", "time": "Thu Feb 01 15:47:42 2024 +0000" }, "message": "Make libnativehelper_compat_libc++ public.\n\nIts visibility was restricted with the intention to track dependencies\n(cf. http://b/151443957#comment77 ff). However, it only uses stable\nAPIs and doesn\u0027t do anything fishy so there are no plans to move away\nfrom it. Hence there\u0027s no reason to limit visibility either.\n\nAlso cleaned up and clarified the docs in README.md a bit.\n\nTest: mmm libnativehelper\nBug: 151443957\nChange-Id: I33fb3724e50ca8fc1bb57b08e5f71bbd306b6e78\n" }, { "commit": "2830ad755ddea88771f7e8659ffee24c31709af7", "tree": "e1d58ad1771aa4fd4314dbb6f7859a70560b7293", "parents": [ "d06f8fbd373ed94dcc241139fd227a74b9b79630", "80fe5f9354878d9a55b08765d91a10a16b4b25bc" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Jan 10 21:12:02 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 10 21:12:02 2024 +0000" }, "message": "Merge \"Add missing libc++ includes\" into main am: 7d70bc049d am: 6c6eea236a am: 80fe5f9354\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2901902\n\nChange-Id: If18b24225594f17955e7f988bafcbb6f6d197426\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "80fe5f9354878d9a55b08765d91a10a16b4b25bc", "tree": "e1d58ad1771aa4fd4314dbb6f7859a70560b7293", "parents": [ "00edfdcfcdad9329a399d8d886a0a2278a31989c", "6c6eea236a49b4dfa17a183d9e6eca9dbbd28b99" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Jan 10 20:21:02 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 10 20:21:02 2024 +0000" }, "message": "Merge \"Add missing libc++ includes\" into main am: 7d70bc049d am: 6c6eea236a\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2901902\n\nChange-Id: I76e9408c75aeb38eaebf4d019df1a8a8a4f2f724\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6c6eea236a49b4dfa17a183d9e6eca9dbbd28b99", "tree": "e1d58ad1771aa4fd4314dbb6f7859a70560b7293", "parents": [ "2dac49d5f26afbd5e2f90ea315767e0e5c169222", "7d70bc049d62500d457fe8be7ca4dff9542804d7" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Jan 10 19:36:17 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 10 19:36:17 2024 +0000" }, "message": "Merge \"Add missing libc++ includes\" into main am: 7d70bc049d\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2901902\n\nChange-Id: I26996f9c3a33f7dc86a15103363a9bc8db8d6d97\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7d70bc049d62500d457fe8be7ca4dff9542804d7", "tree": "e1d58ad1771aa4fd4314dbb6f7859a70560b7293", "parents": [ "b4974c2464d6bcf702a36bcd99e46885a29a37b2", "4ee79ecafb7194057b42f6783f9ae80d1a491061" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Jan 10 17:56:42 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jan 10 17:56:42 2024 +0000" }, "message": "Merge \"Add missing libc++ includes\" into main" }, { "commit": "4ee79ecafb7194057b42f6783f9ae80d1a491061", "tree": "e1d58ad1771aa4fd4314dbb6f7859a70560b7293", "parents": [ "b4974c2464d6bcf702a36bcd99e46885a29a37b2" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Tue Jan 09 10:52:01 2024 -0800" }, "committer": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Tue Jan 09 10:52:01 2024 -0800" }, "message": "Add missing libc++ includes\n\nBug: 175635923\nTest: m MODULES-IN-libnativehelper\nChange-Id: I9545d38e7a0f49882d1d36b85aff4b093c11e8d7\n" }, { "commit": "d06f8fbd373ed94dcc241139fd227a74b9b79630", "tree": "22addc0700b18a3547333b4e49bd4ad9717c20a4", "parents": [ "5f6167d7ace976bad8560a59fda1606302421737", "31a261d502eeac8ffe7b03829f2450c8fb794c9c" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Wed Jan 03 17:27:22 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 03 17:27:22 2024 +0000" }, "message": "[automerger skipped] Fix the use-after-free issue with CREATE_UTF_OR_RETURN. am: 31a261d502 -s ours\n\nam skip reason: Merged-In I4ee4162f78ea949bfbe42282034d47dc5d0a0c4d with SHA-1 dc1e927c68 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/libnativehelper/+/25778912\n\nChange-Id: I31cf76979e6512d80475de4a9a0c696aef85f3a4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5f6167d7ace976bad8560a59fda1606302421737", "tree": "22addc0700b18a3547333b4e49bd4ad9717c20a4", "parents": [ "21f873796842dea16dc7acd725877f823b74cb8b", "3b58c4334a0d98313e2620377c9abb11b6e40e44" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Wed Jan 03 17:27:19 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 03 17:27:19 2024 +0000" }, "message": "[automerger skipped] Add an implicit cast from `ScopedUtfChars` to `std::string_view`. am: 3b58c4334a -s ours\n\nam skip reason: Merged-In Iab8f78cb186fe454a69d3248826ffdf797a8760c with SHA-1 0f96cc0441 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/libnativehelper/+/25778911\n\nChange-Id: Ia8cf6d4443442a85baff8687e59d8bc352cab207\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "21f873796842dea16dc7acd725877f823b74cb8b", "tree": "22addc0700b18a3547333b4e49bd4ad9717c20a4", "parents": [ "e597b7e0afeeb96fddcda383a087a15df8f71300", "ae7a6134a906e21520a2a296bab8b4c038a4e352" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Wed Jan 03 17:27:15 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 03 17:27:15 2024 +0000" }, "message": "[automerger skipped] Add JNI helper methods to convert between jstring and C string. am: ae7a6134a9 -s ours\n\nam skip reason: Merged-In I389d72ee89a9594728032eafb6b53c56f33a5be6 with SHA-1 4be05051ef is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/libnativehelper/+/25778910\n\nChange-Id: Ie8f4c61aede4855b57ecd4cafd64448a09c74cf5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e597b7e0afeeb96fddcda383a087a15df8f71300", "tree": "22addc0700b18a3547333b4e49bd4ad9717c20a4", "parents": [ "3cea574fdef4f234713231785655885c48eac3ed", "c3803b81160fbaa055def7e139cb80132beddde5" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Wed Jan 03 17:27:10 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 03 17:27:10 2024 +0000" }, "message": "[automerger skipped] Export liblog headers from libnativehelper. am: c3803b8116 -s ours\n\nam skip reason: Merged-In I1d1ed34b085374038f948ce33079f9545eb88372 with SHA-1 643cc8c09e is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/libnativehelper/+/25778909\n\nChange-Id: I764820328f7a67b10668d71ab3dc230a8b8f6b86\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3cea574fdef4f234713231785655885c48eac3ed", "tree": "22addc0700b18a3547333b4e49bd4ad9717c20a4", "parents": [ "7e11c06a19d9aee00d5dc250265ce525b520e2d6", "00edfdcfcdad9329a399d8d886a0a2278a31989c" ], "author": { "name": "Roland Levillain", "email": "rpl@google.com", "time": "Wed Jan 03 14:47:06 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 03 14:47:06 2024 +0000" }, "message": "Merge \"Update `OWNERS` files under `libnativehelper`.\" into main am: b4974c2464 am: 2dac49d5f2 am: 00edfdcfcd\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2894202\n\nChange-Id: If16bead624cde21b3b22fb8f7c7e6ab6693b7162\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "00edfdcfcdad9329a399d8d886a0a2278a31989c", "tree": "22addc0700b18a3547333b4e49bd4ad9717c20a4", "parents": [ "2d329ebb6cb128fd210c93352e40875ed23f4b4f", "2dac49d5f26afbd5e2f90ea315767e0e5c169222" ], "author": { "name": "Roland Levillain", "email": "rpl@google.com", "time": "Wed Jan 03 13:58:44 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 03 13:58:44 2024 +0000" }, "message": "Merge \"Update `OWNERS` files under `libnativehelper`.\" into main am: b4974c2464 am: 2dac49d5f2\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2894202\n\nChange-Id: I796f19c729da7513ddc9598292d3690c07f89be1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2dac49d5f26afbd5e2f90ea315767e0e5c169222", "tree": "22addc0700b18a3547333b4e49bd4ad9717c20a4", "parents": [ "2d329ebb6cb128fd210c93352e40875ed23f4b4f", "b4974c2464d6bcf702a36bcd99e46885a29a37b2" ], "author": { "name": "Roland Levillain", "email": "rpl@google.com", "time": "Wed Jan 03 13:28:59 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 03 13:28:59 2024 +0000" }, "message": "Merge \"Update `OWNERS` files under `libnativehelper`.\" into main am: b4974c2464\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2894202\n\nChange-Id: I24ec31b7ca9fb0020b3e4c097422c258656bd167\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b4974c2464d6bcf702a36bcd99e46885a29a37b2", "tree": "22addc0700b18a3547333b4e49bd4ad9717c20a4", "parents": [ "2d329ebb6cb128fd210c93352e40875ed23f4b4f", "4c360db11bd0c6032784cb800f69843768ccea13" ], "author": { "name": "Roland Levillain", "email": "rpl@google.com", "time": "Wed Jan 03 13:01:46 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jan 03 13:01:46 2024 +0000" }, "message": "Merge \"Update `OWNERS` files under `libnativehelper`.\" into main" }, { "commit": "31a261d502eeac8ffe7b03829f2450c8fb794c9c", "tree": "899a2d71e3fd4029dedb2552f696933d8edcfad6", "parents": [ "3b58c4334a0d98313e2620377c9abb11b6e40e44" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Mon Sep 25 14:52:00 2023 +0100" }, "committer": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Tue Jan 02 21:26:55 2024 +0000" }, "message": "Fix the use-after-free issue with CREATE_UTF_OR_RETURN.\n\nBefore this change, if `expr` creates temporary objects, the objects\nwere destroyed as soon as the first line of the macro was evaluated,\ncausing a use-after-free issue. This CL fixes it using a lambda\nexpression.\n\nBug: 301377542\nTest: Run `atest MtsLibnativehelperTestCases` on an hwasan build.\nChange-Id: I4ee4162f78ea949bfbe42282034d47dc5d0a0c4d\nMerged-In: I4ee4162f78ea949bfbe42282034d47dc5d0a0c4d\n" }, { "commit": "3b58c4334a0d98313e2620377c9abb11b6e40e44", "tree": "3aea41593bdf251a532a2040a756af14f1fc19a5", "parents": [ "ae7a6134a906e21520a2a296bab8b4c038a4e352" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Thu Sep 14 23:53:18 2023 +0100" }, "committer": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Tue Jan 02 21:26:47 2024 +0000" }, "message": "Add an implicit cast from `ScopedUtfChars` to `std::string_view`.\n\nBug: 298183834\nTest: Presubmit\nChange-Id: Iab8f78cb186fe454a69d3248826ffdf797a8760c\nMerged-In: Iab8f78cb186fe454a69d3248826ffdf797a8760c\n" }, { "commit": "ae7a6134a906e21520a2a296bab8b4c038a4e352", "tree": "af6e2d8dd39af25c37fb83b2ad2db8b48fce7681", "parents": [ "c3803b81160fbaa055def7e139cb80132beddde5" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Tue Sep 12 18:32:28 2023 +0100" }, "committer": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Tue Jan 02 21:26:32 2024 +0000" }, "message": "Add JNI helper methods to convert between jstring and C string.\n\nBug: 298183834\nTest: atest MtsLibnativehelperTestCases\nChange-Id: I389d72ee89a9594728032eafb6b53c56f33a5be6\nMerged-In: I389d72ee89a9594728032eafb6b53c56f33a5be6\n" }, { "commit": "c3803b81160fbaa055def7e139cb80132beddde5", "tree": "af972a0f895406556e7635ac9d005d308e25244b", "parents": [ "f55c65db82cc25e0db5257357ee9d3b123b5c78a" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Tue Sep 12 14:09:43 2023 +0100" }, "committer": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Tue Jan 02 21:26:16 2024 +0000" }, "message": "Export liblog headers from libnativehelper.\n\nlibnativehelper includes liblog headers in libnativehelper/JNIHelp.h.\n\nBug: 298183834\nTest: m\nChange-Id: I1d1ed34b085374038f948ce33079f9545eb88372\nMerged-In: I1d1ed34b085374038f948ce33079f9545eb88372\n" }, { "commit": "4c360db11bd0c6032784cb800f69843768ccea13", "tree": "22addc0700b18a3547333b4e49bd4ad9717c20a4", "parents": [ "2d329ebb6cb128fd210c93352e40875ed23f4b4f" ], "author": { "name": "Roland Levillain", "email": "rpl@google.com", "time": "Tue Jan 02 18:30:35 2024 +0000" }, "committer": { "name": "Roland Levillain", "email": "rpl@google.com", "time": "Tue Jan 02 18:40:49 2024 +0000" }, "message": "Update `OWNERS` files under `libnativehelper`.\n\nTest: n/a\nChange-Id: Idea152446b598357e8dad2add6c40008402883fa\n" }, { "commit": "7e11c06a19d9aee00d5dc250265ce525b520e2d6", "tree": "124c7e9f5ba1b79387f9436ed1390ab211e7a0fd", "parents": [ "70757d39109e215b1ff6719d61fa3ac82e52125d", "2d329ebb6cb128fd210c93352e40875ed23f4b4f" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Fri Oct 13 21:57:48 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 13 21:57:48 2023 +0000" }, "message": "Merge \"Remove deprecated constexpr storage from test.\" into main am: ef727660e8 am: de582ad23e am: a8430f2610 am: 45e93098c4 am: 2d329ebb6c\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2768716\n\nChange-Id: Id5684b5f96f89cd32a07305aeea7fb42eac8713b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2d329ebb6cb128fd210c93352e40875ed23f4b4f", "tree": "124c7e9f5ba1b79387f9436ed1390ab211e7a0fd", "parents": [ "f038be6a2a427fbfff4fd1400b4acd48b473f9e0", "45e93098c46ee531ce7052ce39538c6a17cf63db" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Fri Oct 13 21:25:48 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 13 21:25:48 2023 +0000" }, "message": "Merge \"Remove deprecated constexpr storage from test.\" into main am: ef727660e8 am: de582ad23e am: a8430f2610 am: 45e93098c4\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2768716\n\nChange-Id: Idce5275c7e91319227890fae618782d8e1cf1657\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "45e93098c46ee531ce7052ce39538c6a17cf63db", "tree": "124c7e9f5ba1b79387f9436ed1390ab211e7a0fd", "parents": [ "c42c9f9561a66ac35674b84f2ea461926d1f5509", "a8430f2610480337115703fcc707c1cb814a974d" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Fri Oct 13 20:53:00 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 13 20:53:00 2023 +0000" }, "message": "Merge \"Remove deprecated constexpr storage from test.\" into main am: ef727660e8 am: de582ad23e am: a8430f2610\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2768716\n\nChange-Id: I0bd9e89e38e3290e0a83e25bdcca69df15e35930\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a8430f2610480337115703fcc707c1cb814a974d", "tree": "124c7e9f5ba1b79387f9436ed1390ab211e7a0fd", "parents": [ "d14541c21cff8c378e16e6c7a964bdd646ede8d6", "de582ad23e95c3c2def053a78a57ac7f3a33e105" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Fri Oct 13 20:19:56 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 13 20:19:56 2023 +0000" }, "message": "Merge \"Remove deprecated constexpr storage from test.\" into main am: ef727660e8 am: de582ad23e\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2768716\n\nChange-Id: I1a3b580d179b7a707a5c5107f044289e5f5a1dd8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "de582ad23e95c3c2def053a78a57ac7f3a33e105", "tree": "124c7e9f5ba1b79387f9436ed1390ab211e7a0fd", "parents": [ "75869fb0092468011aadfdfda0e733fdeae01f4a", "ef727660e85743274affb902c2c17e57da86ab6f" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Fri Oct 13 19:47:39 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 13 19:47:39 2023 +0000" }, "message": "Merge \"Remove deprecated constexpr storage from test.\" into main am: ef727660e8\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2768716\n\nChange-Id: Ic18eb776bf98953b5d0613af42eb9d0e42d80d4a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ef727660e85743274affb902c2c17e57da86ab6f", "tree": "124c7e9f5ba1b79387f9436ed1390ab211e7a0fd", "parents": [ "75869fb0092468011aadfdfda0e733fdeae01f4a", "743ab73c152fa056b3a2c222c11c6f61d4b9edbc" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Fri Oct 13 19:23:04 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Oct 13 19:23:04 2023 +0000" }, "message": "Merge \"Remove deprecated constexpr storage from test.\" into main" }, { "commit": "743ab73c152fa056b3a2c222c11c6f61d4b9edbc", "tree": "124c7e9f5ba1b79387f9436ed1390ab211e7a0fd", "parents": [ "e40898a5b1d0d6d38c9d5256b9e968def5226c8b" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Tue Oct 03 02:26:22 2023 +0000" }, "committer": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Sat Oct 07 02:14:43 2023 +0000" }, "message": "Remove deprecated constexpr storage from test.\n\nAttempting to define constexpr variables in the .cpp file\ntriggers -Wdeprecated. This warning is currently force-disabled\nin the global config, but we want to enable it.\n\nBug: 241601211\nTest: m checkbuild, presubmit\nChange-Id: Id53d6d97f917f5ebf8af3d385bd8c2e744f945f8\n" }, { "commit": "70757d39109e215b1ff6719d61fa3ac82e52125d", "tree": "292df4e7e44d7673e5601199479b89fcdb8a82b6", "parents": [ "cc8a7c5d0dbadc517b04ac9b4558347988770651", "f038be6a2a427fbfff4fd1400b4acd48b473f9e0" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Sep 26 01:28:39 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 26 01:28:39 2023 +0000" }, "message": "Merge \"Fix the use-after-free issue with CREATE_UTF_OR_RETURN.\" into main am: e40898a5b1 am: 75869fb009 am: d14541c21c am: c42c9f9561 am: f038be6a2a\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2761593\n\nChange-Id: I13320f040e41161f0ab2ec972112e162dfae4356\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f038be6a2a427fbfff4fd1400b4acd48b473f9e0", "tree": "292df4e7e44d7673e5601199479b89fcdb8a82b6", "parents": [ "fcd19d8b421350e57389bc6ce96abf0193586fff", "c42c9f9561a66ac35674b84f2ea461926d1f5509" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Sep 26 00:23:32 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 26 00:23:32 2023 +0000" }, "message": "Merge \"Fix the use-after-free issue with CREATE_UTF_OR_RETURN.\" into main am: e40898a5b1 am: 75869fb009 am: d14541c21c am: c42c9f9561\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2761593\n\nChange-Id: I169b6811a6dee72c0c169d24d85be9097e311d6a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c42c9f9561a66ac35674b84f2ea461926d1f5509", "tree": "292df4e7e44d7673e5601199479b89fcdb8a82b6", "parents": [ "695b85d9170046a8b39d89c4ded53c4093d9e6af", "d14541c21cff8c378e16e6c7a964bdd646ede8d6" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Sep 25 23:41:20 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 25 23:41:20 2023 +0000" }, "message": "Merge \"Fix the use-after-free issue with CREATE_UTF_OR_RETURN.\" into main am: e40898a5b1 am: 75869fb009 am: d14541c21c\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2761593\n\nChange-Id: I90cacc6a4a8799638f856f043fbecf2188f9d180\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d14541c21cff8c378e16e6c7a964bdd646ede8d6", "tree": "292df4e7e44d7673e5601199479b89fcdb8a82b6", "parents": [ "ad0b7eb21c550439c4f8dadc9981d16d2bc5a252", "75869fb0092468011aadfdfda0e733fdeae01f4a" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Sep 25 22:47:36 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 25 22:47:36 2023 +0000" }, "message": "Merge \"Fix the use-after-free issue with CREATE_UTF_OR_RETURN.\" into main am: e40898a5b1 am: 75869fb009\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2761593\n\nChange-Id: Ibb2b29ceea130e0799528b67ddbcfc1ddcadb165\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "75869fb0092468011aadfdfda0e733fdeae01f4a", "tree": "292df4e7e44d7673e5601199479b89fcdb8a82b6", "parents": [ "e4a26d278f86e67913b8286ea7be8a5b702cc0b8", "e40898a5b1d0d6d38c9d5256b9e968def5226c8b" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Sep 25 21:49:33 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 25 21:49:33 2023 +0000" }, "message": "Merge \"Fix the use-after-free issue with CREATE_UTF_OR_RETURN.\" into main am: e40898a5b1\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2761593\n\nChange-Id: I873748e6d41dcb06955e4f158b82f63c1a675158\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e40898a5b1d0d6d38c9d5256b9e968def5226c8b", "tree": "292df4e7e44d7673e5601199479b89fcdb8a82b6", "parents": [ "4515bc009666daed8989c7e13d32ffdef2096193", "dc1e927c68b24b333df3d2c04ee7e4b0f26060b7" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Sep 25 20:41:33 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Sep 25 20:41:33 2023 +0000" }, "message": "Merge \"Fix the use-after-free issue with CREATE_UTF_OR_RETURN.\" into main" }, { "commit": "dc1e927c68b24b333df3d2c04ee7e4b0f26060b7", "tree": "292df4e7e44d7673e5601199479b89fcdb8a82b6", "parents": [ "4515bc009666daed8989c7e13d32ffdef2096193" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Mon Sep 25 14:52:00 2023 +0100" }, "committer": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Mon Sep 25 20:25:50 2023 +0100" }, "message": "Fix the use-after-free issue with CREATE_UTF_OR_RETURN.\n\nBefore this change, if `expr` creates temporary objects, the objects\nwere destroyed as soon as the first line of the macro was evaluated,\ncausing a use-after-free issue. This CL fixes it using a lambda\nexpression.\n\nBug: 301377542\nTest: Run `atest MtsLibnativehelperTestCases` on an hwasan build.\nChange-Id: I4ee4162f78ea949bfbe42282034d47dc5d0a0c4d\n" }, { "commit": "cc8a7c5d0dbadc517b04ac9b4558347988770651", "tree": "777113adfb95f6dfd39535412e14b7ef2ac4d4a8", "parents": [ "843f24676c1ca45f90a0bd68b761e3bcbdd22e64", "fcd19d8b421350e57389bc6ce96abf0193586fff" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Mon Sep 18 18:56:51 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 18 18:56:51 2023 +0000" }, "message": "Merge changes Iab8f78cb,I389d72ee into main am: 4515bc0096 am: e4a26d278f am: ad0b7eb21c am: 695b85d917 am: fcd19d8b42\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2753325\n\nChange-Id: Ifdc647e4f7290a9ec46478a1ec59394ad743ae86\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fcd19d8b421350e57389bc6ce96abf0193586fff", "tree": "777113adfb95f6dfd39535412e14b7ef2ac4d4a8", "parents": [ "d63a39289433e10d3a76474e553cfce6cb9fb4e6", "695b85d9170046a8b39d89c4ded53c4093d9e6af" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Mon Sep 18 17:51:53 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 18 17:51:53 2023 +0000" }, "message": "Merge changes Iab8f78cb,I389d72ee into main am: 4515bc0096 am: e4a26d278f am: ad0b7eb21c am: 695b85d917\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2753325\n\nChange-Id: If2a706b2b489d70c7f0af969b6d280dd4f452fd6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "695b85d9170046a8b39d89c4ded53c4093d9e6af", "tree": "777113adfb95f6dfd39535412e14b7ef2ac4d4a8", "parents": [ "dfca4d073fe774842fb8238edb80abc4ef22d040", "ad0b7eb21c550439c4f8dadc9981d16d2bc5a252" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Mon Sep 18 17:11:12 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 18 17:11:12 2023 +0000" }, "message": "Merge changes Iab8f78cb,I389d72ee into main am: 4515bc0096 am: e4a26d278f am: ad0b7eb21c\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2753325\n\nChange-Id: I2e4f4b459b9701bb24bd297329de615239643ad0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ad0b7eb21c550439c4f8dadc9981d16d2bc5a252", "tree": "777113adfb95f6dfd39535412e14b7ef2ac4d4a8", "parents": [ "122797c106906b5268ad088ba7460df2815b0e97", "e4a26d278f86e67913b8286ea7be8a5b702cc0b8" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Mon Sep 18 16:16:53 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 18 16:16:53 2023 +0000" }, "message": "Merge changes Iab8f78cb,I389d72ee into main am: 4515bc0096 am: e4a26d278f\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2753325\n\nChange-Id: I1d63f8faf3d782acfb40bb7e7b5eb6b44397b0cd\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e4a26d278f86e67913b8286ea7be8a5b702cc0b8", "tree": "777113adfb95f6dfd39535412e14b7ef2ac4d4a8", "parents": [ "0f98e4a9d6cffda08caa098fe96d4d888dba0b1b", "4515bc009666daed8989c7e13d32ffdef2096193" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Mon Sep 18 15:17:40 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 18 15:17:40 2023 +0000" }, "message": "Merge changes Iab8f78cb,I389d72ee into main am: 4515bc0096\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2753325\n\nChange-Id: I65346cf13e30aa26980df266cf486f8f1794a7c9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4515bc009666daed8989c7e13d32ffdef2096193", "tree": "777113adfb95f6dfd39535412e14b7ef2ac4d4a8", "parents": [ "160e2b5d8d58f161a01097c4b91c6676caeb710c", "0f96cc0441c626c6172d5c9dfe12c4c6be70873f" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Mon Sep 18 14:47:00 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Sep 18 14:47:00 2023 +0000" }, "message": "Merge changes Iab8f78cb,I389d72ee into main\n\n* changes:\n Add an implicit cast from `ScopedUtfChars` to `std::string_view`.\n Add JNI helper methods to convert between jstring and C string.\n" }, { "commit": "0f96cc0441c626c6172d5c9dfe12c4c6be70873f", "tree": "777113adfb95f6dfd39535412e14b7ef2ac4d4a8", "parents": [ "4be05051ef76b2c24d8385732a892401eb45d911" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Thu Sep 14 23:53:18 2023 +0100" }, "committer": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Fri Sep 15 22:16:49 2023 +0100" }, "message": "Add an implicit cast from `ScopedUtfChars` to `std::string_view`.\n\nBug: 298183834\nTest: Presubmit\nChange-Id: Iab8f78cb186fe454a69d3248826ffdf797a8760c\n" }, { "commit": "4be05051ef76b2c24d8385732a892401eb45d911", "tree": "270905292f7404dd7e7fa699b1c40153af203e9b", "parents": [ "160e2b5d8d58f161a01097c4b91c6676caeb710c" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Tue Sep 12 18:32:28 2023 +0100" }, "committer": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Fri Sep 15 22:16:46 2023 +0100" }, "message": "Add JNI helper methods to convert between jstring and C string.\n\nBug: 298183834\nTest: atest MtsLibnativehelperTestCases\nChange-Id: I389d72ee89a9594728032eafb6b53c56f33a5be6\n" }, { "commit": "843f24676c1ca45f90a0bd68b761e3bcbdd22e64", "tree": "b0a8810ccccf1cd64c4ebe604ee9a3ad703963e6", "parents": [ "b2e5575aa8a275804209ff57c31badd0f9afbbdd", "d63a39289433e10d3a76474e553cfce6cb9fb4e6" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Sep 12 22:58:19 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 12 22:58:19 2023 +0000" }, "message": "Merge \"Add .clang-format to libnativehelper.\" into main am: 160e2b5d8d am: 0f98e4a9d6 am: 122797c106 am: dfca4d073f am: d63a392894\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2748415\n\nChange-Id: I7ee897b3f870931f2d95960e892496e4f071562f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d63a39289433e10d3a76474e553cfce6cb9fb4e6", "tree": "b0a8810ccccf1cd64c4ebe604ee9a3ad703963e6", "parents": [ "9b194394cfd15d35857e37f37d37936ea00f1de2", "dfca4d073fe774842fb8238edb80abc4ef22d040" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Sep 12 21:53:40 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 12 21:53:40 2023 +0000" }, "message": "Merge \"Add .clang-format to libnativehelper.\" into main am: 160e2b5d8d am: 0f98e4a9d6 am: 122797c106 am: dfca4d073f\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2748415\n\nChange-Id: Ib24aa19f5393ab7c1b29b3f5788d4938f1554975\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "dfca4d073fe774842fb8238edb80abc4ef22d040", "tree": "b0a8810ccccf1cd64c4ebe604ee9a3ad703963e6", "parents": [ "dbcbae282b4a002f4e276a1226d2688bae56e240", "122797c106906b5268ad088ba7460df2815b0e97" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Sep 12 21:16:50 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 12 21:16:50 2023 +0000" }, "message": "Merge \"Add .clang-format to libnativehelper.\" into main am: 160e2b5d8d am: 0f98e4a9d6 am: 122797c106\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2748415\n\nChange-Id: I503bbdb48a98b1dd21e5706206f11f017c577e31\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b2e5575aa8a275804209ff57c31badd0f9afbbdd", "tree": "5fece1e2425fa87de774a6a64cb883dda95e3fc6", "parents": [ "210d89a35e5691e47075be010f5cf26543ea4bbb", "9b194394cfd15d35857e37f37d37936ea00f1de2" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Sep 12 21:14:01 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 12 21:14:01 2023 +0000" }, "message": "Merge \"Export liblog headers from libnativehelper.\" into main am: 25a89f90d1 am: 6bb2fe0d76 am: e693b98b16 am: dbcbae282b am: 9b194394cf\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2747716\n\nChange-Id: Ia238402aa159a947ab6f7b71895fd59e9cb3cf51\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "122797c106906b5268ad088ba7460df2815b0e97", "tree": "b0a8810ccccf1cd64c4ebe604ee9a3ad703963e6", "parents": [ "e693b98b16ea1941abb346562d287028f311075f", "0f98e4a9d6cffda08caa098fe96d4d888dba0b1b" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Sep 12 20:27:45 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 12 20:27:45 2023 +0000" }, "message": "Merge \"Add .clang-format to libnativehelper.\" into main am: 160e2b5d8d am: 0f98e4a9d6\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2748415\n\nChange-Id: Ide69c698e7f2227326d72bd2cb9b138b7403cc35\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9b194394cfd15d35857e37f37d37936ea00f1de2", "tree": "5fece1e2425fa87de774a6a64cb883dda95e3fc6", "parents": [ "353e5853baaba6a3c90ef7b51aac9fbbd1d2edd9", "dbcbae282b4a002f4e276a1226d2688bae56e240" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Sep 12 20:19:34 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 12 20:19:34 2023 +0000" }, "message": "Merge \"Export liblog headers from libnativehelper.\" into main am: 25a89f90d1 am: 6bb2fe0d76 am: e693b98b16 am: dbcbae282b\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2747716\n\nChange-Id: I61f7f6ce16a227789206253a7191dc5fd595e71c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0f98e4a9d6cffda08caa098fe96d4d888dba0b1b", "tree": "b0a8810ccccf1cd64c4ebe604ee9a3ad703963e6", "parents": [ "6bb2fe0d76bb2adff3997c9f585e8aa38423ade4", "160e2b5d8d58f161a01097c4b91c6676caeb710c" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Sep 12 19:37:35 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 12 19:37:35 2023 +0000" }, "message": "Merge \"Add .clang-format to libnativehelper.\" into main am: 160e2b5d8d\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2748415\n\nChange-Id: I2b8a3804d558730ddd0f9c8c6e15dcaef3bcc2f7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "160e2b5d8d58f161a01097c4b91c6676caeb710c", "tree": "b0a8810ccccf1cd64c4ebe604ee9a3ad703963e6", "parents": [ "25a89f90d15cd5dd40245101abf72ae7ab2a9b41", "9cada419cf78f903c3b8cb4f7558e0464ba3238f" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Sep 12 19:07:16 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Sep 12 19:07:16 2023 +0000" }, "message": "Merge \"Add .clang-format to libnativehelper.\" into main" }, { "commit": "dbcbae282b4a002f4e276a1226d2688bae56e240", "tree": "5fece1e2425fa87de774a6a64cb883dda95e3fc6", "parents": [ "6a82aa00291acb8848ce0976538603782b08e26d", "e693b98b16ea1941abb346562d287028f311075f" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Sep 12 18:45:08 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 12 18:45:08 2023 +0000" }, "message": "Merge \"Export liblog headers from libnativehelper.\" into main am: 25a89f90d1 am: 6bb2fe0d76 am: e693b98b16\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2747716\n\nChange-Id: I066107c0a5d80660de87d30ab4142fda0d0c498b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9cada419cf78f903c3b8cb4f7558e0464ba3238f", "tree": "b0a8810ccccf1cd64c4ebe604ee9a3ad703963e6", "parents": [ "643cc8c09e806f1ab9b8262cf22a282e1decd046" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Tue Sep 12 16:05:19 2023 +0100" }, "committer": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Tue Sep 12 19:11:34 2023 +0100" }, "message": "Add .clang-format to libnativehelper.\n\nCopied from art/.clang-format with IndentWidth modified to 4.\n\nBug: 298183834\nTest: git clang-format\nChange-Id: I14d76115d9f7e1c690d854e7d7b79cf096047cde\n" }, { "commit": "e693b98b16ea1941abb346562d287028f311075f", "tree": "5fece1e2425fa87de774a6a64cb883dda95e3fc6", "parents": [ "21c519180a41c560c5dad7f117879820a5f4732a", "6bb2fe0d76bb2adff3997c9f585e8aa38423ade4" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Sep 12 17:05:07 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 12 17:05:07 2023 +0000" }, "message": "Merge \"Export liblog headers from libnativehelper.\" into main am: 25a89f90d1 am: 6bb2fe0d76\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2747716\n\nChange-Id: Ibff6db41ab6f0b000da5ccdc769e24c40a77c6b8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6bb2fe0d76bb2adff3997c9f585e8aa38423ade4", "tree": "5fece1e2425fa87de774a6a64cb883dda95e3fc6", "parents": [ "32ae39da166ed29433c2f81bb2c498c61663e12d", "25a89f90d15cd5dd40245101abf72ae7ab2a9b41" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Sep 12 16:10:19 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 12 16:10:19 2023 +0000" }, "message": "Merge \"Export liblog headers from libnativehelper.\" into main am: 25a89f90d1\n\nOriginal change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2747716\n\nChange-Id: Ibdc3481b21682e25e8004a8866502a970bb77ee0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "25a89f90d15cd5dd40245101abf72ae7ab2a9b41", "tree": "5fece1e2425fa87de774a6a64cb883dda95e3fc6", "parents": [ "d75a8bed7bf0561a7390dd88c5cd66b716d55a06", "643cc8c09e806f1ab9b8262cf22a282e1decd046" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Sep 12 14:40:25 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Sep 12 14:40:25 2023 +0000" }, "message": "Merge \"Export liblog headers from libnativehelper.\" into main" } ], "next": "643cc8c09e806f1ab9b8262cf22a282e1decd046" }