)]}' { "log": [ { "commit": "c8206780937dba60e53ce2fef7cc57c50439c30b", "tree": "089efd81aa5326d912c72894b71c09b0431be5a4", "parents": [ "213d3e99934c3587ed46439aa4dfc02200e51e4c", "49c352ea7ec71218c62ba7de47109fe82ca52bf9" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Mar 10 09:56:05 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Mar 10 09:56:05 2025 -0700" }, "message": "Merge \"Merge 25Q1 (ab/BP1A.250305.020) to AOSP main\" into main" }, { "commit": "49c352ea7ec71218c62ba7de47109fe82ca52bf9", "tree": "089efd81aa5326d912c72894b71c09b0431be5a4", "parents": [ "213d3e99934c3587ed46439aa4dfc02200e51e4c", "29760cd47243320f1e927a24b14f6bf28eb09dfe" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Mar 08 16:09:47 2025 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Mar 08 16:09:47 2025 -0800" }, "message": "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main\n\nBug: 385190204\nMerged-In: I341e06a9a0582efac5faebed5e6ca5d83a496cd9\nChange-Id: If72b22bce35420ebe67ecc95103675d93a41550b\n" }, { "commit": "29760cd47243320f1e927a24b14f6bf28eb09dfe", "tree": "089efd81aa5326d912c72894b71c09b0431be5a4", "parents": [ "4bef501e96db70d4dd42289650e41b617963b91d", "3e513f9e2c095a64d2e387c422cb1a699d69ea3a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Feb 10 14:08:08 2025 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Feb 10 14:08:08 2025 -0800" }, "message": "Merge 25Q1 (ab/12770256) to aosp-main-future\n\nBug: 385190204\nMerged-In: I0d0baf927dd45c7ac6fd67a1fb23c56b62d3b9a4\nChange-Id: Ia10b5f46998716c4ce1dc9b92b773477fa94ea4d\n" }, { "commit": "4bef501e96db70d4dd42289650e41b617963b91d", "tree": "35bcb124e17c6f669b8797ec1213f2c493ddc20a", "parents": [ "7c726e1d1c8b6bddb29c216afadd3f584d9f050b", "213d3e99934c3587ed46439aa4dfc02200e51e4c" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Sun Feb 09 09:09:52 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Feb 09 09:09:52 2025 -0800" }, "message": "Merge \"Modify apex_available to Bluetooth apex\" into main am: 213d3e9993\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/3446410\n\nChange-Id: I811ace1d1684000e18c851c486c3caf535c931fd\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "213d3e99934c3587ed46439aa4dfc02200e51e4c", "tree": "35bcb124e17c6f669b8797ec1213f2c493ddc20a", "parents": [ "641e7503db7e886f858ccefac149e34d32c03218", "3f9461b7c955763f413047a831b98c3dce5b13c7" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Sun Feb 09 08:33:06 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Sun Feb 09 08:33:06 2025 -0800" }, "message": "Merge \"Modify apex_available to Bluetooth apex\" into main" }, { "commit": "3f9461b7c955763f413047a831b98c3dce5b13c7", "tree": "35bcb124e17c6f669b8797ec1213f2c493ddc20a", "parents": [ "641e7503db7e886f858ccefac149e34d32c03218" ], "author": { "name": "William Escande", "email": "wescande@google.com", "time": "Thu Jan 09 14:37:52 2025 -0800" }, "committer": { "name": "William Escande", "email": "wescande@google.com", "time": "Thu Jan 09 14:37:52 2025 -0800" }, "message": "Modify apex_available to Bluetooth apex\n\nBluetooth apex name has changed from com.android.btservices to\ncom.android.bt. We now need to update the reference in the code.\n\nUpdating apex_available in bp and other reference from within the code\n\nBug: 383863941\nFlag: Exempt build infra\nTest: m .\nChange-Id: I49e0b1a583a01a92eecbf1ec812674748a094987\n" }, { "commit": "7c726e1d1c8b6bddb29c216afadd3f584d9f050b", "tree": "b391a557bb6cc1a9eb40e6bb97f024abc9bc22a4", "parents": [ "bd864edaa49cbdbd646b07ec40d277a419f5443f", "641e7503db7e886f858ccefac149e34d32c03218" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Jan 09 09:34:00 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 09 09:34:00 2025 -0800" }, "message": "Merge \"Make protobuf lib available for recovery\" into main am: 641e7503db\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/3425884\n\nChange-Id: I9a9f9a73aab18a2ca3a15f0ceee6f1360c652ddc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "641e7503db7e886f858ccefac149e34d32c03218", "tree": "b391a557bb6cc1a9eb40e6bb97f024abc9bc22a4", "parents": [ "ce18abaa76f21768bcdc3f90c02d0a475cbfc58c", "97aad8a6b6e4f04d11bb81c2e1c694c5dcdf89bc" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Jan 09 09:00:42 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jan 09 09:00:42 2025 -0800" }, "message": "Merge \"Make protobuf lib available for recovery\" into main" }, { "commit": "97aad8a6b6e4f04d11bb81c2e1c694c5dcdf89bc", "tree": "b391a557bb6cc1a9eb40e6bb97f024abc9bc22a4", "parents": [ "ce18abaa76f21768bcdc3f90c02d0a475cbfc58c" ], "author": { "name": "Victor Shutemov", "email": "victor@haleytek.com", "time": "Thu Dec 19 20:45:46 2024 +0100" }, "committer": { "name": "Victor Shutemov", "email": "victor@haleytek.com", "time": "Thu Dec 19 12:18:41 2024 -0800" }, "message": "Make protobuf lib available for recovery\n\nprotobuf is a dependency for grpc and need to be available\nin recovery as well.\n\nAndroid.bp is updated with recovery_avaiable: true\n\nBug: 384810312\nChange-Id: I9f0c18afd92e1a0d4e4ebd18969fadb59f9f8efe\n" }, { "commit": "bd864edaa49cbdbd646b07ec40d277a419f5443f", "tree": "44e27e6a39b76e3382a95a98176c92f0e0d07d68", "parents": [ "1576414e9ead2684bf3d50de7ae162c0183017db", "ce18abaa76f21768bcdc3f90c02d0a475cbfc58c" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Dec 18 13:42:17 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Dec 18 13:42:17 2024 -0800" }, "message": "Merge \"Remove test_com.android.os.statsd from apex_available\" into main am: ce18abaa76\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/3407379\n\nChange-Id: I79a8bcbb5679a501bfcff2b235d89925ee9e076d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ce18abaa76f21768bcdc3f90c02d0a475cbfc58c", "tree": "44e27e6a39b76e3382a95a98176c92f0e0d07d68", "parents": [ "1576414e9ead2684bf3d50de7ae162c0183017db", "ed8df5267676e3ac9b61bb0f2300223aab8073a4" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Dec 18 13:11:17 2024 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Dec 18 13:11:17 2024 -0800" }, "message": "Merge \"Remove test_com.android.os.statsd from apex_available\" into main" }, { "commit": "ed8df5267676e3ac9b61bb0f2300223aab8073a4", "tree": "44e27e6a39b76e3382a95a98176c92f0e0d07d68", "parents": [ "1576414e9ead2684bf3d50de7ae162c0183017db" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Dec 11 12:51:47 2024 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Dec 11 12:58:04 2024 -0800" }, "message": "Remove test_com.android.os.statsd from apex_available\n\nIn order to simplify the apex logic in Soong, avoid needing to mention\ntest apexes in apex_available by setting apex_available_name in the\ntest apex to masquerade as the corresponding non-test apex.\n\nBug: 383592644\nTest: builds\nChange-Id: I5e3edc22e57b1938da90e459cdbcc85e5eec65e8\n" }, { "commit": "3e513f9e2c095a64d2e387c422cb1a699d69ea3a", "tree": "b72d220dde85bcd658c4bceb096939ead1ae927c", "parents": [ "ee0ebe23728b0dce2008f051954d94e33a621869" ], "author": { "name": "Sandeep Bandaru", "email": "sandeepbandaru@google.com", "time": "Thu Dec 05 07:26:03 2024 +0000" }, "committer": { "name": "Sandeep Bandaru", "email": "sandeepbandaru@google.com", "time": "Thu Dec 05 07:28:43 2024 +0000" }, "message": "Add neuralnetworks apex available for libprotobuf-java-nano\n\nChange-Id: I0d0baf927dd45c7ac6fd67a1fb23c56b62d3b9a4\nFlag: build.release_ondevice_intelligence_module\nBug: 376427781\n" }, { "commit": "ee0ebe23728b0dce2008f051954d94e33a621869", "tree": "b4007cba55a9e3f8e8ebf456fcedf557367b7f22", "parents": [ "2342c976d873e7f6c10df5a70aceb7fd7ef02131", "1576414e9ead2684bf3d50de7ae162c0183017db" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 18 21:12:51 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 18 21:12:51 2024 +0000" }, "message": "[automerger skipped] Mark 24Q4 as merged in aosp-main-future am: 1576414e9e -s ours\n\nam skip reason: Merged-In Ib44e02ceac77164647a6ac0ba1d27187ff165686 with SHA-1 a371378076 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/29933958\n\nChange-Id: I203b379f75ca2975f9beeeba908250cb03adc3ee\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1576414e9ead2684bf3d50de7ae162c0183017db", "tree": "b4007cba55a9e3f8e8ebf456fcedf557367b7f22", "parents": [ "b4d765c966b52576c1a46c45a12c39471aeaff03", "03ab2128d81f56681c863d92267ce6e8c8bc7e5a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 17 11:03:27 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 17 11:03:27 2024 -0700" }, "message": "Mark 24Q4 as merged in aosp-main-future\n\nBug: 373937381\nMerged-In: Ib44e02ceac77164647a6ac0ba1d27187ff165686\nChange-Id: Ic0c693ed59ddb47f5f27549164be73e8d76a4ba7\n" }, { "commit": "2342c976d873e7f6c10df5a70aceb7fd7ef02131", "tree": "b4007cba55a9e3f8e8ebf456fcedf557367b7f22", "parents": [ "03ab2128d81f56681c863d92267ce6e8c8bc7e5a", "b4d765c966b52576c1a46c45a12c39471aeaff03" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Sep 27 19:32:16 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 27 19:32:16 2024 +0000" }, "message": "Merge \"Suppress ReturnValueIgnored errorprone issues\" into main am: 90bc34bca4 am: b4d765c966\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/3273244\n\nChange-Id: I23ce82c7581a91a072ab2adc8121021a28eb6d55\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b4d765c966b52576c1a46c45a12c39471aeaff03", "tree": "b4007cba55a9e3f8e8ebf456fcedf557367b7f22", "parents": [ "86b6608c9e41c64fc0fd7f64ddc29e796bae20f9", "90bc34bca486cd1726b5f91fe55f938bb4635f04" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Sep 27 19:08:49 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 27 19:08:49 2024 +0000" }, "message": "Merge \"Suppress ReturnValueIgnored errorprone issues\" into main am: 90bc34bca4\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/3273244\n\nChange-Id: Ibc84dd5a9a018ef68c04bcefa27a3009d98ce942\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "90bc34bca486cd1726b5f91fe55f938bb4635f04", "tree": "b4007cba55a9e3f8e8ebf456fcedf557367b7f22", "parents": [ "86b6608c9e41c64fc0fd7f64ddc29e796bae20f9", "b9a3680350e2db9f3c09e396eb115551a4c804ac" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Sep 27 18:47:37 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Sep 27 18:47:37 2024 +0000" }, "message": "Merge \"Suppress ReturnValueIgnored errorprone issues\" into main" }, { "commit": "b9a3680350e2db9f3c09e396eb115551a4c804ac", "tree": "b4007cba55a9e3f8e8ebf456fcedf557367b7f22", "parents": [ "86b6608c9e41c64fc0fd7f64ddc29e796bae20f9" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Fri Sep 20 16:52:05 2024 -0700" }, "committer": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Fri Sep 20 16:54:28 2024 -0700" }, "message": "Suppress ReturnValueIgnored errorprone issues\n\nTo be able to run this check on protobuf generated sources.\nAlso changed string_field_lite.cc from using a variable to using\nthe SuppressWarnings annotation, because that takes less\nbytecode.\n\nThis change was already submitted in upstream protobuf:\nhttps://github.com/protocolbuffers/protobuf/commit/bbbc7b967113ec7f5da3950c7c97e832507ffe96\n\nBug: 253827323\nTest: Presubmits\nChange-Id: I5b93cc331ff29fccfcdc2670d2623919a1804c11\n" }, { "commit": "03ab2128d81f56681c863d92267ce6e8c8bc7e5a", "tree": "ba14aa336b1aa2d55897d5f3eeadfed9439ec9d7", "parents": [ "06abef3fda9edab1c5c70fe777c7b9eb9be21e5a", "86b6608c9e41c64fc0fd7f64ddc29e796bae20f9" ], "author": { "name": "Zixuan Qu", "email": "zixuanqu@google.com", "time": "Wed Sep 04 00:38:21 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 04 00:38:21 2024 +0000" }, "message": "[automerger skipped] Merge \"Merged-In: Ib44e02ceac77164647a6ac0ba1d27187ff165686 Export `any.proto`.\" into main am: 872b623251 am: 86b6608c9e -s ours\n\nam skip reason: Merged-In Ib44e02ceac77164647a6ac0ba1d27187ff165686 with SHA-1 a371378076 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/3250475\n\nChange-Id: I84959a27033830d4bc6758db10d6077c461167fb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "86b6608c9e41c64fc0fd7f64ddc29e796bae20f9", "tree": "ba14aa336b1aa2d55897d5f3eeadfed9439ec9d7", "parents": [ "c5bbafd8cb4975fb9ec20c700b2d54c706a55cea", "872b623251313fe616fe85d3eabece8ef263a62a" ], "author": { "name": "Zixuan Qu", "email": "zixuanqu@google.com", "time": "Wed Sep 04 00:28:43 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 04 00:28:43 2024 +0000" }, "message": "Merge \"Merged-In: Ib44e02ceac77164647a6ac0ba1d27187ff165686 Export `any.proto`.\" into main am: 872b623251\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/3250475\n\nChange-Id: I62273a82853edad0bf582687f9dc5ec5149d70e8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "872b623251313fe616fe85d3eabece8ef263a62a", "tree": "ba14aa336b1aa2d55897d5f3eeadfed9439ec9d7", "parents": [ "952aa85c4751f794cfc19c5b408ada5f25a406b6", "363eab69c4aea4986572eb61ddf490556627e940" ], "author": { "name": "Zixuan Qu", "email": "zixuanqu@google.com", "time": "Wed Sep 04 00:15:29 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Sep 04 00:15:29 2024 +0000" }, "message": "Merge \"Merged-In: Ib44e02ceac77164647a6ac0ba1d27187ff165686 Export `any.proto`.\" into main" }, { "commit": "363eab69c4aea4986572eb61ddf490556627e940", "tree": "ba14aa336b1aa2d55897d5f3eeadfed9439ec9d7", "parents": [ "952aa85c4751f794cfc19c5b408ada5f25a406b6" ], "author": { "name": "Zixuan Qu", "email": "zixuanqu@google.com", "time": "Thu Aug 29 22:27:49 2024 +0000" }, "committer": { "name": "Android Build Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Thu Aug 29 22:27:49 2024 +0000" }, "message": "Merged-In: Ib44e02ceac77164647a6ac0ba1d27187ff165686\nExport `any.proto`.\n\nThis allows using rich error codes defined in `google/api/rpc/status.proto` on Android devices.\n\nSee also https://grpc.io/docs/guides/error/#richer-error-model\n\nBug:362514436\nTest: m\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a371378076b56c9ec2759f836d5de9c196460250)\nMerged-In: Ib44e02ceac77164647a6ac0ba1d27187ff165686\nChange-Id: Ib44e02ceac77164647a6ac0ba1d27187ff165686\n" }, { "commit": "06abef3fda9edab1c5c70fe777c7b9eb9be21e5a", "tree": "ba14aa336b1aa2d55897d5f3eeadfed9439ec9d7", "parents": [ "a6e4df1e804efa3eabe69e80a9e35799723bcd6a", "a371378076b56c9ec2759f836d5de9c196460250" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Aug 29 20:58:10 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 29 20:58:10 2024 +0000" }, "message": "Merge \"Export `any.proto`.\" into main" }, { "commit": "a371378076b56c9ec2759f836d5de9c196460250", "tree": "9d18359a78a177429ff55e4de75d6bba42fa6456", "parents": [ "27189b5e8e717bb1b3ba05078f5dd4da1a3f61f3" ], "author": { "name": "Zixuan Qu", "email": "zixuanqu@google.com", "time": "Mon Aug 26 14:48:28 2024 -0700" }, "committer": { "name": "Zixuan Qu", "email": "zixuanqu@google.com", "time": "Tue Aug 27 17:41:13 2024 +0000" }, "message": "Export `any.proto`.\n\nThis allows using rich error codes defined in `google/api/rpc/status.proto` on Android devices.\n\nSee also https://grpc.io/docs/guides/error/#richer-error-model\n\nBug:362514436\nTest: m\n\nChange-Id: Ib44e02ceac77164647a6ac0ba1d27187ff165686\n" }, { "commit": "a6e4df1e804efa3eabe69e80a9e35799723bcd6a", "tree": "c196d72e7f42b0209a6c6d7a61fbb6b3d3c3a399", "parents": [ "27189b5e8e717bb1b3ba05078f5dd4da1a3f61f3", "c5bbafd8cb4975fb9ec20c700b2d54c706a55cea" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Aug 26 20:56:03 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 26 20:56:03 2024 +0000" }, "message": "Merge \"Specify is_stubs_module property\" into main am: 952aa85c47 am: c5bbafd8cb\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/3167796\n\nChange-Id: Ie48b5af4c0e31b42a95d54dc29caf81d1c6936f8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c5bbafd8cb4975fb9ec20c700b2d54c706a55cea", "tree": "c196d72e7f42b0209a6c6d7a61fbb6b3d3c3a399", "parents": [ "911708729d43db97f7d26b34c142964357b880e0", "952aa85c4751f794cfc19c5b408ada5f25a406b6" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Aug 26 20:38:18 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 26 20:38:18 2024 +0000" }, "message": "Merge \"Specify is_stubs_module property\" into main am: 952aa85c47\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/3167796\n\nChange-Id: I61b6fbe11e9685712f6a5e58af2327756bdf6917\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "952aa85c4751f794cfc19c5b408ada5f25a406b6", "tree": "c196d72e7f42b0209a6c6d7a61fbb6b3d3c3a399", "parents": [ "c7fee4b4d00ae7243df4cf704fcd402d14c51441", "db2558fefd4d383430c5f68c7e6f4734ccfce7a4" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Aug 26 20:12:37 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Aug 26 20:12:37 2024 +0000" }, "message": "Merge \"Specify is_stubs_module property\" into main" }, { "commit": "db2558fefd4d383430c5f68c7e6f4734ccfce7a4", "tree": "1289a965c55579c74e3a41c34eee02dcdd4d6863", "parents": [ "c55a6a7b1fd793d919ecf3e44cdf7d514df96c2f" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Jul 11 18:04:45 2024 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Jul 11 18:04:45 2024 +0000" }, "message": "Specify is_stubs_module property\n\nThis change specifies is_stubs_module property to a module that\nprovides stubs, so that the build system recognizes it and can be used\nfor inter-container dependency.\n\nTest: m nothing\nBug: 338660802\nChange-Id: I67c7117bb0f85ddbb72fb26320e73586f15c5f22\n" }, { "commit": "27189b5e8e717bb1b3ba05078f5dd4da1a3f61f3", "tree": "dd2eb1ba2af99b2c4d2aefa3f337ed37f30899f3", "parents": [ "4cadcc6fad599a43fd351882a8a3beec4b374782", "911708729d43db97f7d26b34c142964357b880e0" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Jun 27 23:36:19 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 27 23:36:19 2024 +0000" }, "message": "Merge \"enable rtti on host for libprotobuf\" into main am: c7fee4b4d0 am: 911708729d\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/3117942\n\nChange-Id: I01e248640f75a7782498f8343dc2ad307245cf97\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "911708729d43db97f7d26b34c142964357b880e0", "tree": "dd2eb1ba2af99b2c4d2aefa3f337ed37f30899f3", "parents": [ "4cadcc6fad599a43fd351882a8a3beec4b374782", "c7fee4b4d00ae7243df4cf704fcd402d14c51441" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Jun 27 23:17:34 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 27 23:17:34 2024 +0000" }, "message": "Merge \"enable rtti on host for libprotobuf\" into main am: c7fee4b4d0\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/3117942\n\nChange-Id: I7919e500de3c51674a2067a698df058eefd51a0b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c7fee4b4d00ae7243df4cf704fcd402d14c51441", "tree": "dd2eb1ba2af99b2c4d2aefa3f337ed37f30899f3", "parents": [ "c55a6a7b1fd793d919ecf3e44cdf7d514df96c2f", "751b1001798319163a99cc81f31696f38398f5c9" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Jun 27 22:59:08 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jun 27 22:59:08 2024 +0000" }, "message": "Merge \"enable rtti on host for libprotobuf\" into main" }, { "commit": "751b1001798319163a99cc81f31696f38398f5c9", "tree": "dd2eb1ba2af99b2c4d2aefa3f337ed37f30899f3", "parents": [ "8b3bb789abcfcd4c47774e1989114b64ca0e5ae1" ], "author": { "name": "Frederick Mayle", "email": "fmayle@google.com", "time": "Fri Jun 07 15:44:35 2024 -0700" }, "committer": { "name": "Frederick Mayle", "email": "fmayle@google.com", "time": "Fri Jun 07 15:44:35 2024 -0700" }, "message": "enable rtti on host for libprotobuf\n\nRTTI was enabled by default on host before but that is changing. There\nis code that depends on RTTI for libprotobuf types on host, so we need\nto keep it on for now.\n\nBug: 341341056\nTest: m\nChange-Id: I086dae33aff50269963b7d77c02ffd68145ac5e3\n" }, { "commit": "4cadcc6fad599a43fd351882a8a3beec4b374782", "tree": "31a425387068c0b4dc75a270cf765cb98ed83c39", "parents": [ "e4c7e61956c6ad6ba9aa6e102081ae7c6aa06d0a", "c55a6a7b1fd793d919ecf3e44cdf7d514df96c2f" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 23:46:05 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 29 23:46:05 2024 +0000" }, "message": "[automerger skipped] Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future am: c55a6a7b1f -s ours\n\nam skip reason: Merged-In Icbfa35c89f84a9fa03633fdd5ee1d49943835e6c with SHA-1 ac88a1bf75 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/27145355\n\nChange-Id: Iff00491161a45303d4af92fdc2f68fc267547f81\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c55a6a7b1fd793d919ecf3e44cdf7d514df96c2f", "tree": "31a425387068c0b4dc75a270cf765cb98ed83c39", "parents": [ "ac88a1bf75bce7d57f9fbfd8c0de41ac360b8991", "492541331a54a0394f101b8fcad7a363c33fb8f2" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 11:50:25 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 11:50:25 2024 -0700" }, "message": "Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future\n\nBug: 337098550\nMerged-In: Icbfa35c89f84a9fa03633fdd5ee1d49943835e6c\nChange-Id: I6bef90fc8af777df3500520001ca0b01c8aab21a\n" }, { "commit": "e4c7e61956c6ad6ba9aa6e102081ae7c6aa06d0a", "tree": "31a425387068c0b4dc75a270cf765cb98ed83c39", "parents": [ "00f6aa50e01e3da4ea771e2f7f2400484f03b3cb", "ac88a1bf75bce7d57f9fbfd8c0de41ac360b8991" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Sat Mar 30 14:32:36 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Mar 30 14:32:36 2024 +0000" }, "message": "Merge \"Enable windows targets for protobuf\" into main am: 8b3bb789ab am: ac88a1bf75\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/3005828\n\nChange-Id: Ifdd9675afbf643750a2124e11556896bfa1f42c5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ac88a1bf75bce7d57f9fbfd8c0de41ac360b8991", "tree": "31a425387068c0b4dc75a270cf765cb98ed83c39", "parents": [ "aa2114b5eddfe665babd49643924c0cd437b5c25", "8b3bb789abcfcd4c47774e1989114b64ca0e5ae1" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Sat Mar 30 14:13:13 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Mar 30 14:13:13 2024 +0000" }, "message": "Merge \"Enable windows targets for protobuf\" into main am: 8b3bb789ab\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/3005828\n\nChange-Id: Icbfa35c89f84a9fa03633fdd5ee1d49943835e6c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8b3bb789abcfcd4c47774e1989114b64ca0e5ae1", "tree": "31a425387068c0b4dc75a270cf765cb98ed83c39", "parents": [ "89e2aece8546e9e86ac0051f56a8ea0591e68690", "0294829446a576345444f3cb28be2b01c6ea3c9f" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Sat Mar 30 13:58:14 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Sat Mar 30 13:58:14 2024 +0000" }, "message": "Merge \"Enable windows targets for protobuf\" into main" }, { "commit": "0294829446a576345444f3cb28be2b01c6ea3c9f", "tree": "8ac80515d1ce246f34acefadd32a655dee53477f", "parents": [ "10c6e11ed5d64ed17ad7193e6bfa12ba0d636498" ], "author": { "name": "Matt Gilbride", "email": "mattgilbride@google.com", "time": "Wed Feb 28 14:50:05 2024 +0000" }, "committer": { "name": "Matt Gilbride", "email": "mattgilbride@google.com", "time": "Mon Mar 18 14:27:52 2024 +0000" }, "message": "Enable windows targets for protobuf\n\nThe `apksig`/`apksigner` build targets\nnow rely on protbuf, and windows must\nbe enabled (transitively) on all dependencies\n\nBug: 319296492\nTest: TH\nChange-Id: I7304e19b07a4b37dafbbc8496b153436f1d120f0\n" }, { "commit": "00f6aa50e01e3da4ea771e2f7f2400484f03b3cb", "tree": "542b35432afe23a7902670e39b659ba69c040d1d", "parents": [ "586280c52f722bc2fac0fc79b4ce7726efc5ae8f", "aa2114b5eddfe665babd49643924c0cd437b5c25" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Mar 07 10:49:53 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 07 10:49:53 2024 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 14 QPR2 to AOSP main\" into main am: 89e2aece85 -s ours am: aa2114b5ed -s ours\n\nam skip reason: Merged-In I9a2e5c3ed40d20c6bc4ff15fab9c888d720198ea with SHA-1 f2b076a65c is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2990688\n\nChange-Id: Ie8d12a74ef0a707c8462be7e14bb8936b68e559d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "586280c52f722bc2fac0fc79b4ce7726efc5ae8f", "tree": "542b35432afe23a7902670e39b659ba69c040d1d", "parents": [ "492541331a54a0394f101b8fcad7a363c33fb8f2", "93ee4ced327525a7a371c2c695de7f5510562314" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Mar 07 10:46:37 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 07 10:46:37 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 40126746d7 -s ours am: 93ee4ced32 -s ours\n\nam skip reason: Merged-In I9a2e5c3ed40d20c6bc4ff15fab9c888d720198ea with SHA-1 f2b076a65c is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2990688\n\nChange-Id: Ic0f425254f934fd83ee81bf993edf4fbff6d8ccf\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "aa2114b5eddfe665babd49643924c0cd437b5c25", "tree": "542b35432afe23a7902670e39b659ba69c040d1d", "parents": [ "93ee4ced327525a7a371c2c695de7f5510562314", "89e2aece8546e9e86ac0051f56a8ea0591e68690" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Mar 07 09:58:30 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 07 09:58:30 2024 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 14 QPR2 to AOSP main\" into main am: 89e2aece85 -s ours\n\nam skip reason: Merged-In I9a2e5c3ed40d20c6bc4ff15fab9c888d720198ea with SHA-1 f2b076a65c is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2990688\n\nChange-Id: I8690b8de8e31a86fa7ee18f04ff1e6a4c990f42d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "93ee4ced327525a7a371c2c695de7f5510562314", "tree": "542b35432afe23a7902670e39b659ba69c040d1d", "parents": [ "f2b076a65c8f1e4d68113c10fe0153c1f61ef257", "40126746d7270a1892a47c862f5a663fdb771fb2" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Mar 07 09:55:11 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 07 09:55:11 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 40126746d7 -s ours\n\nam skip reason: Merged-In I9a2e5c3ed40d20c6bc4ff15fab9c888d720198ea with SHA-1 f2b076a65c is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2990688\n\nChange-Id: Iab6780044f9e9f3673592239df6b403a4c53385d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "89e2aece8546e9e86ac0051f56a8ea0591e68690", "tree": "542b35432afe23a7902670e39b659ba69c040d1d", "parents": [ "10c6e11ed5d64ed17ad7193e6bfa12ba0d636498", "40126746d7270a1892a47c862f5a663fdb771fb2" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Mar 07 06:41:03 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Mar 07 06:41:03 2024 +0000" }, "message": "Merge \"Merge Android 14 QPR2 to AOSP main\" into main" }, { "commit": "40126746d7270a1892a47c862f5a663fdb771fb2", "tree": "542b35432afe23a7902670e39b659ba69c040d1d", "parents": [ "10c6e11ed5d64ed17ad7193e6bfa12ba0d636498", "f2b076a65c8f1e4d68113c10fe0153c1f61ef257" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Mar 06 09:29:56 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Mar 06 09:29:56 2024 -0800" }, "message": "Merge Android 14 QPR2 to AOSP main\n\nBug: 319669529\nMerged-In: I9a2e5c3ed40d20c6bc4ff15fab9c888d720198ea\nChange-Id: Iaf0688c7a895e0c308d2cc8f27f7c3e78e4ad4d3\n" }, { "commit": "492541331a54a0394f101b8fcad7a363c33fb8f2", "tree": "542b35432afe23a7902670e39b659ba69c040d1d", "parents": [ "ccaa2373867e357fd811107d2fdc5c7841b33f07", "f2b076a65c8f1e4d68113c10fe0153c1f61ef257" ], "author": { "name": "Yifan Hong", "email": "elsk@google.com", "time": "Tue Feb 13 01:23:54 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 13 01:23:54 2024 +0000" }, "message": "Merge \"Revert BUILD.bazel to v21.12.\" into main am: 10c6e11ed5 am: f2b076a65c\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2957432\n\nChange-Id: Iee2dc46c9a6ae1513289cf25939985b0212aeac0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f2b076a65c8f1e4d68113c10fe0153c1f61ef257", "tree": "542b35432afe23a7902670e39b659ba69c040d1d", "parents": [ "28d0d70eb2773f60c666e7f9461f989095357aa8", "10c6e11ed5d64ed17ad7193e6bfa12ba0d636498" ], "author": { "name": "Yifan Hong", "email": "elsk@google.com", "time": "Tue Feb 13 00:43:33 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 13 00:43:33 2024 +0000" }, "message": "Merge \"Revert BUILD.bazel to v21.12.\" into main am: 10c6e11ed5\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2957432\n\nChange-Id: I9a2e5c3ed40d20c6bc4ff15fab9c888d720198ea\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "10c6e11ed5d64ed17ad7193e6bfa12ba0d636498", "tree": "67285593f4a53f56f485a06262907b1c4d62988f", "parents": [ "b020e298f9424851db8a4e2f7dd75b51448e823a", "60c819ef60566c8dc6aa18d1149e44e4f3cb8cef" ], "author": { "name": "Yifan Hong", "email": "elsk@google.com", "time": "Tue Feb 13 00:11:34 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Feb 13 00:11:34 2024 +0000" }, "message": "Merge \"Revert BUILD.bazel to v21.12.\" into main" }, { "commit": "60c819ef60566c8dc6aa18d1149e44e4f3cb8cef", "tree": "67285593f4a53f56f485a06262907b1c4d62988f", "parents": [ "b020e298f9424851db8a4e2f7dd75b51448e823a" ], "author": { "name": "Yifan Hong", "email": "elsk@google.com", "time": "Fri Feb 09 14:47:17 2024 -0800" }, "committer": { "name": "Yifan Hong", "email": "elsk@google.com", "time": "Fri Feb 09 14:49:38 2024 -0800" }, "message": "Revert BUILD.bazel to v21.12.\n\nRevert file to version f0dc78d7e6e331b8c6bb2d5283e06aa26883ca7c.\n\nChange-Id: Id4acc0b72990e010b4cc66aa4c9b3290a201b3e9\n" }, { "commit": "ccaa2373867e357fd811107d2fdc5c7841b33f07", "tree": "b88ac01cceab28ecbd6703b2f606eeeb57ccf72e", "parents": [ "1ac5b3394a348b055b7b2cd9a01a817af24e3f4f", "28d0d70eb2773f60c666e7f9461f989095357aa8" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jan 31 02:03:25 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 31 02:03:25 2024 +0000" }, "message": "[automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: 28d0d70eb2 -s ours\n\nam skip reason: Merged-In Ic18a13c2c761d4805354d750d9b7794bdec32fe4 with SHA-1 4aadd33724 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/25974040\n\nChange-Id: Ibcf75d1da89002c4bbbb9097707002d24097a660\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "28d0d70eb2773f60c666e7f9461f989095357aa8", "tree": "b88ac01cceab28ecbd6703b2f606eeeb57ccf72e", "parents": [ "bb6f90ee169acf7c634eb455901e38c83879c432", "1a7c2aed3129770d18c097925fe8e3b3f2f02909" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jan 23 20:29:41 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jan 23 20:29:41 2024 -0800" }, "message": "Merge Android 24Q1 Release (ab/11220357)\n\nBug: 319669529\nMerged-In: Ic18a13c2c761d4805354d750d9b7794bdec32fe4\nChange-Id: I231118710d594b86a61623c1d70de376fb3b57d8\n" }, { "commit": "1ac5b3394a348b055b7b2cd9a01a817af24e3f4f", "tree": "b88ac01cceab28ecbd6703b2f606eeeb57ccf72e", "parents": [ "1a7c2aed3129770d18c097925fe8e3b3f2f02909", "bb6f90ee169acf7c634eb455901e38c83879c432" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Jan 23 02:39:18 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jan 23 02:39:18 2024 +0000" }, "message": "Merge \"remove btservices from apex available for libprotobuf-cpp-full\" into main am: b020e298f9 am: bb6f90ee16\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2647000\n\nChange-Id: Ie6dbc279a21015666a4633a8db565f505a676434\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bb6f90ee169acf7c634eb455901e38c83879c432", "tree": "1f425fdfb60dc62ba9fa392168d5d628efd75aa6", "parents": [ "4d3414774f361d8ed9e85dae2c122577ae1278b4", "b020e298f9424851db8a4e2f7dd75b51448e823a" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Jan 23 01:58:06 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jan 23 01:58:06 2024 +0000" }, "message": "Merge \"remove btservices from apex available for libprotobuf-cpp-full\" into main am: b020e298f9\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2647000\n\nChange-Id: I9ea5fbb0aeb2690e7794b60856b835948417714a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b020e298f9424851db8a4e2f7dd75b51448e823a", "tree": "1f425fdfb60dc62ba9fa392168d5d628efd75aa6", "parents": [ "4d3414774f361d8ed9e85dae2c122577ae1278b4", "a3b2599c71840abd158d09a014f13144fa63c311" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Jan 23 01:23:31 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jan 23 01:23:31 2024 +0000" }, "message": "Merge \"remove btservices from apex available for libprotobuf-cpp-full\" into main" }, { "commit": "1a7c2aed3129770d18c097925fe8e3b3f2f02909", "tree": "9cd5f51239e0559f87b91340d67aa8199faf408e", "parents": [ "859c233dc2f5c14f4c533e2dc2c3126c3c5dc634", "4d3414774f361d8ed9e85dae2c122577ae1278b4" ], "author": { "name": "Jingwen Chen", "email": "jingwen@google.com", "time": "Thu Oct 12 04:46:18 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 12 04:46:18 2023 +0000" }, "message": "Merge \"Move platform constraints to bazel_common_rules.\" into main am: 8da97eb01f am: f9c5752edc am: 7e78f71722 am: 9543bb19ed am: 4d3414774f\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2782309\n\nChange-Id: I5761fc10ca7cdae283ce9a0bfdbb0dde7f83b561\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4d3414774f361d8ed9e85dae2c122577ae1278b4", "tree": "fea1308ded0ede57f77fb10d1e2de54587f9d892", "parents": [ "d378ab27c30a44c66e045df7e824cd39b9cf8856", "9543bb19ede322784dcd602def4250754368f228" ], "author": { "name": "Jingwen Chen", "email": "jingwen@google.com", "time": "Thu Oct 12 04:14:18 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 12 04:14:18 2023 +0000" }, "message": "Merge \"Move platform constraints to bazel_common_rules.\" into main am: 8da97eb01f am: f9c5752edc am: 7e78f71722 am: 9543bb19ed\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2782309\n\nChange-Id: I2bccdbb1acd8fd18e3ae3f9f96bb68f7bdb3d411\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9543bb19ede322784dcd602def4250754368f228", "tree": "fea1308ded0ede57f77fb10d1e2de54587f9d892", "parents": [ "db79457a3e8edf0e2351636b98a538d9142bcb0a", "7e78f717223e9adf23c01ae7edb90ce5c2f0d282" ], "author": { "name": "Jingwen Chen", "email": "jingwen@google.com", "time": "Thu Oct 12 03:40:54 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 12 03:40:54 2023 +0000" }, "message": "Merge \"Move platform constraints to bazel_common_rules.\" into main am: 8da97eb01f am: f9c5752edc am: 7e78f71722\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2782309\n\nChange-Id: Ie3ca959c128757174b9a3995e50b4e58758f32cb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7e78f717223e9adf23c01ae7edb90ce5c2f0d282", "tree": "fea1308ded0ede57f77fb10d1e2de54587f9d892", "parents": [ "d6f638e3d58537fb6c5c789ac7ad99e82d12d5e7", "f9c5752edc921d9ef5c147ead47dcfaceab29f34" ], "author": { "name": "Jingwen Chen", "email": "jingwen@google.com", "time": "Thu Oct 12 03:07:10 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 12 03:07:10 2023 +0000" }, "message": "Merge \"Move platform constraints to bazel_common_rules.\" into main am: 8da97eb01f am: f9c5752edc\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2782309\n\nChange-Id: I54d0f1cd0d26ec63b6037cc4cc07f702891e2663\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f9c5752edc921d9ef5c147ead47dcfaceab29f34", "tree": "fea1308ded0ede57f77fb10d1e2de54587f9d892", "parents": [ "cad87045be297769ec34309154ac5384e3abb4db", "8da97eb01fd8e2adc0780b802126c23468a1ad36" ], "author": { "name": "Jingwen Chen", "email": "jingwen@google.com", "time": "Thu Oct 12 02:34:48 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 12 02:34:48 2023 +0000" }, "message": "Merge \"Move platform constraints to bazel_common_rules.\" into main am: 8da97eb01f\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2782309\n\nChange-Id: Ie1bf001ac66af5e993ff39a56bec64ad797c6d98\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8da97eb01fd8e2adc0780b802126c23468a1ad36", "tree": "fea1308ded0ede57f77fb10d1e2de54587f9d892", "parents": [ "3d95aae759e555120e4198dd45cfb61c060d8be5", "df7923cdaad9898c39a7af39f568280f3e1c5287" ], "author": { "name": "Jingwen Chen", "email": "jingwen@google.com", "time": "Thu Oct 12 02:22:25 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Oct 12 02:22:25 2023 +0000" }, "message": "Merge \"Move platform constraints to bazel_common_rules.\" into main" }, { "commit": "df7923cdaad9898c39a7af39f568280f3e1c5287", "tree": "fea1308ded0ede57f77fb10d1e2de54587f9d892", "parents": [ "3d95aae759e555120e4198dd45cfb61c060d8be5" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Wed Oct 11 10:03:44 2023 -0700" }, "committer": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Wed Oct 11 10:03:44 2023 -0700" }, "message": "Move platform constraints to bazel_common_rules.\n\nThis enables sharing of platform constraints between platform and kernel builds.\n\nBug: 304594734\nTest: treehugger\nChange-Id: Iad69fe46028a6974646d964a596ceee197eb449f\n" }, { "commit": "859c233dc2f5c14f4c533e2dc2c3126c3c5dc634", "tree": "5388c84fc92ea7306ba96e0d7b2f2dca46ad2f00", "parents": [ "fc0656214c595483b96af023aec26a473810ae36", "d378ab27c30a44c66e045df7e824cd39b9cf8856" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Oct 07 00:26:09 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Oct 07 00:26:09 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 14\" into main am: 3d95aae759 -s ours am: cad87045be -s ours am: d6f638e3d5 -s ours am: db79457a3e -s ours am: d378ab27c3 -s ours\n\nam skip reason: Merged-In I713b8fbfa8498c6ed5c8791c88549269bc325eba with SHA-1 87050d55e3 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2777028\n\nChange-Id: I39e13cd73bc29224f413c277c623280d19e9f3b4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fc0656214c595483b96af023aec26a473810ae36", "tree": "5388c84fc92ea7306ba96e0d7b2f2dca46ad2f00", "parents": [ "a7b0836442d04a31484631c602e372fbbd869a5e", "de06ddd477f6cb2cd9427b7b255cf5ca682e099c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Oct 07 00:20:27 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Oct 07 00:20:27 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 9faa32bae9 -s ours am: 8fbbbffada -s ours am: b47aa7524e -s ours am: e033b199ec -s ours am: de06ddd477 -s ours\n\nam skip reason: Merged-In I713b8fbfa8498c6ed5c8791c88549269bc325eba with SHA-1 87050d55e3 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2777028\n\nChange-Id: I369d53fca94c50f5e42dc3e75398717731655e02\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d378ab27c30a44c66e045df7e824cd39b9cf8856", "tree": "22eaf8d8542862f35e044690ac617c1662081396", "parents": [ "de06ddd477f6cb2cd9427b7b255cf5ca682e099c", "db79457a3e8edf0e2351636b98a538d9142bcb0a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 11:06:38 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 11:06:38 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 14\" into main am: 3d95aae759 -s ours am: cad87045be -s ours am: d6f638e3d5 -s ours am: db79457a3e -s ours\n\nam skip reason: Merged-In I713b8fbfa8498c6ed5c8791c88549269bc325eba with SHA-1 87050d55e3 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2777028\n\nChange-Id: Idab1f34228de90004c0f77fbccbe7a9fbac54260\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "de06ddd477f6cb2cd9427b7b255cf5ca682e099c", "tree": "22eaf8d8542862f35e044690ac617c1662081396", "parents": [ "f04b00ab38fceac5f13cf31c3bfc3e092fcb038b", "e033b199ec9499b5909c6be51ddcb4163fb1564d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 11:00:56 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 11:00:56 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 9faa32bae9 -s ours am: 8fbbbffada -s ours am: b47aa7524e -s ours am: e033b199ec -s ours\n\nam skip reason: Merged-In I713b8fbfa8498c6ed5c8791c88549269bc325eba with SHA-1 87050d55e3 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2777028\n\nChange-Id: Iff0bb1b3b88a561fac07e792699bfd5a07543bcc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "db79457a3e8edf0e2351636b98a538d9142bcb0a", "tree": "22eaf8d8542862f35e044690ac617c1662081396", "parents": [ "e033b199ec9499b5909c6be51ddcb4163fb1564d", "d6f638e3d58537fb6c5c789ac7ad99e82d12d5e7" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 09:57:01 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 09:57:01 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 14\" into main am: 3d95aae759 -s ours am: cad87045be -s ours am: d6f638e3d5 -s ours\n\nam skip reason: Merged-In I713b8fbfa8498c6ed5c8791c88549269bc325eba with SHA-1 87050d55e3 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2777028\n\nChange-Id: Ie15c5ea4beec2837fe88dd27da3dd9651b3b8246\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e033b199ec9499b5909c6be51ddcb4163fb1564d", "tree": "22eaf8d8542862f35e044690ac617c1662081396", "parents": [ "6ee98653ff6f29f40cf6f17a22ca3ec5c679f0ca", "b47aa7524e62717c1c354c7a43a863fbd1180c2f" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 09:51:07 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 09:51:07 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 9faa32bae9 -s ours am: 8fbbbffada -s ours am: b47aa7524e -s ours\n\nam skip reason: Merged-In I713b8fbfa8498c6ed5c8791c88549269bc325eba with SHA-1 87050d55e3 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2777028\n\nChange-Id: I851e3dc1d25621f5af0cee45042cb7fadfca9682\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d6f638e3d58537fb6c5c789ac7ad99e82d12d5e7", "tree": "22eaf8d8542862f35e044690ac617c1662081396", "parents": [ "b47aa7524e62717c1c354c7a43a863fbd1180c2f", "cad87045be297769ec34309154ac5384e3abb4db" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 09:05:09 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 09:05:09 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 14\" into main am: 3d95aae759 -s ours am: cad87045be -s ours\n\nam skip reason: Merged-In I713b8fbfa8498c6ed5c8791c88549269bc325eba with SHA-1 87050d55e3 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2777028\n\nChange-Id: I2ac363c44c52b879d9dad92d3e9012609ebaa7da\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b47aa7524e62717c1c354c7a43a863fbd1180c2f", "tree": "22eaf8d8542862f35e044690ac617c1662081396", "parents": [ "800c932073a85a5e6bddfd75fdb1fc136ad6720d", "8fbbbffada1778a51ddd021ee2ed1e0ff8dafde1" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 08:59:28 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 08:59:28 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 9faa32bae9 -s ours am: 8fbbbffada -s ours\n\nam skip reason: Merged-In I713b8fbfa8498c6ed5c8791c88549269bc325eba with SHA-1 87050d55e3 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2777028\n\nChange-Id: I05d30b6f608781f7023df41d61c92638b7729ee2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cad87045be297769ec34309154ac5384e3abb4db", "tree": "22eaf8d8542862f35e044690ac617c1662081396", "parents": [ "8fbbbffada1778a51ddd021ee2ed1e0ff8dafde1", "3d95aae759e555120e4198dd45cfb61c060d8be5" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 07:58:09 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 07:58:09 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 14\" into main am: 3d95aae759 -s ours\n\nam skip reason: Merged-In I713b8fbfa8498c6ed5c8791c88549269bc325eba with SHA-1 87050d55e3 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2777028\n\nChange-Id: Ib96fac71de0c71f6c20bfdd7bd8e32a8c1c998a0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8fbbbffada1778a51ddd021ee2ed1e0ff8dafde1", "tree": "22eaf8d8542862f35e044690ac617c1662081396", "parents": [ "f72e4c6707e2a4abca8532390cd1cb0569d37bb8", "9faa32bae982eb86787339ac0986907b2ed8dcad" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 07:52:25 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 07:52:25 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 9faa32bae9 -s ours\n\nam skip reason: Merged-In I713b8fbfa8498c6ed5c8791c88549269bc325eba with SHA-1 87050d55e3 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2777028\n\nChange-Id: I16915b322efdb021a8f567a09acc485c5b781941\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3d95aae759e555120e4198dd45cfb61c060d8be5", "tree": "22eaf8d8542862f35e044690ac617c1662081396", "parents": [ "9a75a3d63509ed634a2730fead8a89a5c6e167aa", "9faa32bae982eb86787339ac0986907b2ed8dcad" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 05:34:14 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Oct 06 05:34:14 2023 +0000" }, "message": "Merge \"Merge Android 14\" into main" }, { "commit": "9faa32bae982eb86787339ac0986907b2ed8dcad", "tree": "22eaf8d8542862f35e044690ac617c1662081396", "parents": [ "9a75a3d63509ed634a2730fead8a89a5c6e167aa", "f72e4c6707e2a4abca8532390cd1cb0569d37bb8" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 05 15:39:31 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 05 15:39:31 2023 -0700" }, "message": "Merge Android 14\n\nBug: 298295554\nMerged-In: I713b8fbfa8498c6ed5c8791c88549269bc325eba\nChange-Id: I37d44658fb429bc1172a672eab617f1cf66b4f1a\n" }, { "commit": "a7b0836442d04a31484631c602e372fbbd869a5e", "tree": "5388c84fc92ea7306ba96e0d7b2f2dca46ad2f00", "parents": [ "0c3fd44318e365b0c6cdeecacfbdacb502e40f08", "f04b00ab38fceac5f13cf31c3bfc3e092fcb038b" ], "author": { "name": "Zi Wang", "email": "mrziwang@google.com", "time": "Tue Sep 12 02:15:33 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 12 02:15:33 2023 +0000" }, "message": "Merge changes from topic \"libprotobuf-java-full\" into main am: 9a75a3d635 am: f72e4c6707 am: 800c932073 am: 6ee98653ff am: f04b00ab38\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2745915\n\nChange-Id: I7e130cdb77753b829f84d9d36865b04cebf5957d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0c3fd44318e365b0c6cdeecacfbdacb502e40f08", "tree": "ca0c94f10ce29ecab93837b1a003b766805dfa14", "parents": [ "ec6644a605c8620cf4ffa0da35cfebf760262486", "f46653da212dda39737cfeec9e8016ebd48c526d" ], "author": { "name": "Zi Wang", "email": "mrziwang@google.com", "time": "Tue Sep 12 02:15:29 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 12 02:15:29 2023 +0000" }, "message": "Add handcrafted libprotobuf-java-full am: bd4496b5ef am: c2a2f405a0 am: a2b70c71ac am: d3a3880e41 am: f46653da21\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2745418\n\nChange-Id: I4bf54a08c5610a97f3e46c08fde16912b547d923\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f04b00ab38fceac5f13cf31c3bfc3e092fcb038b", "tree": "22eaf8d8542862f35e044690ac617c1662081396", "parents": [ "f46653da212dda39737cfeec9e8016ebd48c526d", "6ee98653ff6f29f40cf6f17a22ca3ec5c679f0ca" ], "author": { "name": "Zi Wang", "email": "mrziwang@google.com", "time": "Tue Sep 12 01:15:40 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 12 01:15:40 2023 +0000" }, "message": "Merge changes from topic \"libprotobuf-java-full\" into main am: 9a75a3d635 am: f72e4c6707 am: 800c932073 am: 6ee98653ff\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2745915\n\nChange-Id: I9ec6bdd46b2f98966218b965d223c7a5a33fff85\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f46653da212dda39737cfeec9e8016ebd48c526d", "tree": "e1bccc852eb3ff26f97309e924560935bd296333", "parents": [ "272b4ba300ec0f4d3b68144f80c125349a236a0d", "d3a3880e414ae003ba2e7a0bd6aebc02433895b9" ], "author": { "name": "Zi Wang", "email": "mrziwang@google.com", "time": "Tue Sep 12 01:15:37 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 12 01:15:37 2023 +0000" }, "message": "Add handcrafted libprotobuf-java-full am: bd4496b5ef am: c2a2f405a0 am: a2b70c71ac am: d3a3880e41\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2745418\n\nChange-Id: I49bd418d1373907cdb6176b821b97fe78d8a2b66\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6ee98653ff6f29f40cf6f17a22ca3ec5c679f0ca", "tree": "22eaf8d8542862f35e044690ac617c1662081396", "parents": [ "d3a3880e414ae003ba2e7a0bd6aebc02433895b9", "800c932073a85a5e6bddfd75fdb1fc136ad6720d" ], "author": { "name": "Zi Wang", "email": "mrziwang@google.com", "time": "Tue Sep 12 00:39:58 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 12 00:39:58 2023 +0000" }, "message": "Merge changes from topic \"libprotobuf-java-full\" into main am: 9a75a3d635 am: f72e4c6707 am: 800c932073\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2745915\n\nChange-Id: I734e37c487195adc39db2aa7e500d0d94b8e51dd\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d3a3880e414ae003ba2e7a0bd6aebc02433895b9", "tree": "e1bccc852eb3ff26f97309e924560935bd296333", "parents": [ "fe210374424e958ef9caf3a7f145636a39fcc4a7", "a2b70c71acdbeede2ff03abab9d70dbdacaa1dc8" ], "author": { "name": "Zi Wang", "email": "mrziwang@google.com", "time": "Tue Sep 12 00:39:55 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 12 00:39:55 2023 +0000" }, "message": "Add handcrafted libprotobuf-java-full am: bd4496b5ef am: c2a2f405a0 am: a2b70c71ac\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2745418\n\nChange-Id: I1868050d59b6d7321a8ad6f2a7a8a3e065e9a8b2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "800c932073a85a5e6bddfd75fdb1fc136ad6720d", "tree": "22eaf8d8542862f35e044690ac617c1662081396", "parents": [ "a2b70c71acdbeede2ff03abab9d70dbdacaa1dc8", "f72e4c6707e2a4abca8532390cd1cb0569d37bb8" ], "author": { "name": "Zi Wang", "email": "mrziwang@google.com", "time": "Mon Sep 11 23:51:14 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 11 23:51:14 2023 +0000" }, "message": "Merge changes from topic \"libprotobuf-java-full\" into main am: 9a75a3d635 am: f72e4c6707\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2745915\n\nChange-Id: I0be7d027798096e76618566b1bc93846859f9c21\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a2b70c71acdbeede2ff03abab9d70dbdacaa1dc8", "tree": "e1bccc852eb3ff26f97309e924560935bd296333", "parents": [ "78032398ba3a44963d013be164ac1e8b8956b9ec", "c2a2f405a0986af2746670ee3e8358e1c071624e" ], "author": { "name": "Zi Wang", "email": "mrziwang@google.com", "time": "Mon Sep 11 23:51:09 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 11 23:51:09 2023 +0000" }, "message": "Add handcrafted libprotobuf-java-full am: bd4496b5ef am: c2a2f405a0\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2745418\n\nChange-Id: I211e31e84625926aef1269401cf807be18ae9e92\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f72e4c6707e2a4abca8532390cd1cb0569d37bb8", "tree": "22eaf8d8542862f35e044690ac617c1662081396", "parents": [ "c2a2f405a0986af2746670ee3e8358e1c071624e", "9a75a3d63509ed634a2730fead8a89a5c6e167aa" ], "author": { "name": "Zi Wang", "email": "mrziwang@google.com", "time": "Mon Sep 11 22:59:46 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 11 22:59:46 2023 +0000" }, "message": "Merge changes from topic \"libprotobuf-java-full\" into main am: 9a75a3d635\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2745915\n\nChange-Id: Ibe61c5ae0d0e34e4f408175f4e3df9bb468d9391\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c2a2f405a0986af2746670ee3e8358e1c071624e", "tree": "e1bccc852eb3ff26f97309e924560935bd296333", "parents": [ "5393f84e45b6843bb27e9eb87d5765bcc91d6d7e", "bd4496b5ef88e655d6e63a80fb0428f55f476366" ], "author": { "name": "Zi Wang", "email": "mrziwang@google.com", "time": "Mon Sep 11 22:59:44 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 11 22:59:44 2023 +0000" }, "message": "Add handcrafted libprotobuf-java-full am: bd4496b5ef\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2745418\n\nChange-Id: I28b16a94db09740a35ca5a1389ea388f750fa4ca\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9a75a3d63509ed634a2730fead8a89a5c6e167aa", "tree": "3f224c69e5eea8905a266a3c3f0d810c12081fa2", "parents": [ "58a2accc85ce86961849c3327352b538616c5038", "87050d55e3412b2f7968f35906e4f9eeabaaca5f" ], "author": { "name": "Zi Wang", "email": "mrziwang@google.com", "time": "Mon Sep 11 22:50:40 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Sep 11 22:50:40 2023 +0000" }, "message": "Merge changes from topic \"libprotobuf-java-full\" into main\n\n* changes:\n Add filegroup for libprotobuf-java-full java srcs\n Add handcrafted libprotobuf-java-full\n" }, { "commit": "87050d55e3412b2f7968f35906e4f9eeabaaca5f", "tree": "3f224c69e5eea8905a266a3c3f0d810c12081fa2", "parents": [ "bd4496b5ef88e655d6e63a80fb0428f55f476366" ], "author": { "name": "Zi Wang", "email": "mrziwang@google.com", "time": "Thu Sep 07 15:43:08 2023 -0700" }, "committer": { "name": "Zi Wang", "email": "mrziwang@google.com", "time": "Thu Sep 07 15:43:08 2023 -0700" }, "message": "Add filegroup for libprotobuf-java-full java srcs\n\nso that we can stop using glob, which causes error when building it.\n\nTest: CI\n\nBug: 299290824\nChange-Id: I713b8fbfa8498c6ed5c8791c88549269bc325eba\n" }, { "commit": "bd4496b5ef88e655d6e63a80fb0428f55f476366", "tree": "acca5cde7b6a65b8dfa5c54d780ca1e2ffe2a86f", "parents": [ "58a2accc85ce86961849c3327352b538616c5038" ], "author": { "name": "Zi Wang", "email": "mrziwang@google.com", "time": "Thu Sep 07 11:55:38 2023 -0700" }, "committer": { "name": "Zi Wang", "email": "mrziwang@google.com", "time": "Thu Sep 07 11:55:38 2023 -0700" }, "message": "Add handcrafted libprotobuf-java-full\n\nTest: CI\n\nBug: 299290824\nChange-Id: I243acbb8b4ad9ae5d498aaa1558f81beeb668693\n" }, { "commit": "ec6644a605c8620cf4ffa0da35cfebf760262486", "tree": "fcf52fdd5e46e40e319af2e82c1c6e0a7e5cd812", "parents": [ "f703d18433ee655a7dd12da2a33832feefd813b7", "272b4ba300ec0f4d3b68144f80c125349a236a0d" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Sep 01 23:10:32 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 01 23:10:32 2023 +0000" }, "message": "Merge \"Add a sentinel Android.bp in external/protobuf/java\" into main am: 58a2accc85 am: 5393f84e45 am: 78032398ba am: fe21037442 am: 272b4ba300\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2734254\n\nChange-Id: I83e8a517c6b5aef815627ad6531a3f4693e27880\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "272b4ba300ec0f4d3b68144f80c125349a236a0d", "tree": "104271c2396aee9675ceb30cc9f86e4e5c1806b1", "parents": [ "7b70041cbc5fbc20ebdccdb918c8844ce634b2a1", "fe210374424e958ef9caf3a7f145636a39fcc4a7" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Sep 01 22:09:55 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 01 22:09:55 2023 +0000" }, "message": "Merge \"Add a sentinel Android.bp in external/protobuf/java\" into main am: 58a2accc85 am: 5393f84e45 am: 78032398ba am: fe21037442\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2734254\n\nChange-Id: I3d32f8a5275d17cdd06778a2bad20a6c1415cc89\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fe210374424e958ef9caf3a7f145636a39fcc4a7", "tree": "104271c2396aee9675ceb30cc9f86e4e5c1806b1", "parents": [ "f2bbcccbc4347cd8e4c33b805c409b2f2505bc5c", "78032398ba3a44963d013be164ac1e8b8956b9ec" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Sep 01 21:32:44 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 01 21:32:44 2023 +0000" }, "message": "Merge \"Add a sentinel Android.bp in external/protobuf/java\" into main am: 58a2accc85 am: 5393f84e45 am: 78032398ba\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2734254\n\nChange-Id: I759386e480f7523c8bfa87ba1bbd61f1ba130808\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "78032398ba3a44963d013be164ac1e8b8956b9ec", "tree": "104271c2396aee9675ceb30cc9f86e4e5c1806b1", "parents": [ "41871cc5c1e7c72cf4ddb8e29696283a287241f0", "5393f84e45b6843bb27e9eb87d5765bcc91d6d7e" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Sep 01 20:41:46 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 01 20:41:46 2023 +0000" }, "message": "Merge \"Add a sentinel Android.bp in external/protobuf/java\" into main am: 58a2accc85 am: 5393f84e45\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2734254\n\nChange-Id: I85d97a87d830cb4ed6458fcd1398a9aeadba0906\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5393f84e45b6843bb27e9eb87d5765bcc91d6d7e", "tree": "104271c2396aee9675ceb30cc9f86e4e5c1806b1", "parents": [ "38f21beabc2dfb9b087a33e672fd09a337f1c5b1", "58a2accc85ce86961849c3327352b538616c5038" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Sep 01 19:47:10 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 01 19:47:10 2023 +0000" }, "message": "Merge \"Add a sentinel Android.bp in external/protobuf/java\" into main am: 58a2accc85\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2734254\n\nChange-Id: Ib6362eb71175379b3eb9791d2057017889e09569\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "58a2accc85ce86961849c3327352b538616c5038", "tree": "5b7959f35fac0db99e59c08fe296abedf56f866c", "parents": [ "af1fed95c5a64222a4d2d5b3ccbe0448c9dc601d", "157c01d82a7b873cf3d3a4f726a31511ecb74deb" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Sep 01 19:14:18 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Sep 01 19:14:18 2023 +0000" }, "message": "Merge \"Add a sentinel Android.bp in external/protobuf/java\" into main" }, { "commit": "157c01d82a7b873cf3d3a4f726a31511ecb74deb", "tree": "5b7959f35fac0db99e59c08fe296abedf56f866c", "parents": [ "af1fed95c5a64222a4d2d5b3ccbe0448c9dc601d" ], "author": { "name": "Spandan Das", "email": "spandandas@google.com", "time": "Wed Aug 30 18:30:15 2023 +0000" }, "committer": { "name": "Spandan Das", "email": "spandandas@google.com", "time": "Wed Aug 30 18:37:13 2023 +0000" }, "message": "Add a sentinel Android.bp in external/protobuf/java\n\nbp2build will create a proto_library target in the generated BUILD.bazel\nfile so that we can build bazel equivalents of soong modules that use\nexternal/protobuf/java as proto.include_dir\n\nThe alternative would have been to reuse the checked-in\nexternal/protobuf/java/BUILD.bazel file, but that would require\naddressing the following issues\n- Converting this project to an external workspace for android builds.\n (e.g. the BUILD files in this directory refer //java/util which is\n relative to this workspace and not relative to the primary android\n bazel workspace)\n- Forking some BUILD.bazel files (we will need export_files for the\n top-level external/protobuf/Android.bp files)\n- Importing (or creating shims of) transtive deps like rules_pkg\n\nTest: Allowlisted an internal soong module that uses .proto from this\ndir and verified that a\nproto_library is created in\nout/soong/workspace/external/protobuf/java/BUILD.bazel\nBug: 290345526\n\nChange-Id: Ic70763ff3583a9c43357c45baac2687c68e6d66d\n" }, { "commit": "f703d18433ee655a7dd12da2a33832feefd813b7", "tree": "6cc1200946b9d6f023d343004a34de277a01c076", "parents": [ "4b1f51cb2222b6653f2cce6f588f1463cb8e92ca", "7b70041cbc5fbc20ebdccdb918c8844ce634b2a1" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 20:38:21 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 20:38:21 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: 38f21beabc -s ours am: 41871cc5c1 -s ours am: f2bbcccbc4 -s ours am: 7b70041cbc -s ours\n\nam skip reason: Merged-In I292cd07db6611b4d5782bee47ba0ca910bd96456 with SHA-1 81a6f6c689 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/24180957\n\nChange-Id: Ib027f7fefc464aae3fc7e9e8706bebe0e7132b34\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7b70041cbc5fbc20ebdccdb918c8844ce634b2a1", "tree": "c7fe14d0fb063b9e25cc32a207a3c20a41c9c1d5", "parents": [ "34e9717d9cf3eba88b8b5de6a4ba167fe0e7b524", "f2bbcccbc4347cd8e4c33b805c409b2f2505bc5c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 01:11:15 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 01:11:15 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: 38f21beabc -s ours am: 41871cc5c1 -s ours am: f2bbcccbc4 -s ours\n\nam skip reason: Merged-In I292cd07db6611b4d5782bee47ba0ca910bd96456 with SHA-1 81a6f6c689 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/24180957\n\nChange-Id: Ifee381482ad6043f48e983f94ff3047471b631c6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f2bbcccbc4347cd8e4c33b805c409b2f2505bc5c", "tree": "c7fe14d0fb063b9e25cc32a207a3c20a41c9c1d5", "parents": [ "3466cf813e742e71c3d0d2588b8c7a965e6d5a1b", "41871cc5c1e7c72cf4ddb8e29696283a287241f0" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 00:35:31 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 00:35:31 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: 38f21beabc -s ours am: 41871cc5c1 -s ours\n\nam skip reason: Merged-In I292cd07db6611b4d5782bee47ba0ca910bd96456 with SHA-1 81a6f6c689 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/24180957\n\nChange-Id: I3175aaeda20ba4f2dafbc92d3607439e1f04cfa7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "41871cc5c1e7c72cf4ddb8e29696283a287241f0", "tree": "c7fe14d0fb063b9e25cc32a207a3c20a41c9c1d5", "parents": [ "6a3106ba9b8414f245c900744e8055adeca5f5ec", "38f21beabc2dfb9b087a33e672fd09a337f1c5b1" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 28 23:59:32 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 28 23:59:32 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: 38f21beabc -s ours\n\nam skip reason: Merged-In I292cd07db6611b4d5782bee47ba0ca910bd96456 with SHA-1 81a6f6c689 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/24180957\n\nChange-Id: Icc66780c7f545d97b6ab1027e33c133d0a5d766e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "38f21beabc2dfb9b087a33e672fd09a337f1c5b1", "tree": "c7fe14d0fb063b9e25cc32a207a3c20a41c9c1d5", "parents": [ "d963bb2fc76a37713041e62fe3e726c6bcbccc44", "81a6f6c689dff9998198b68b78cd322fa1424a56" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Aug 23 15:49:34 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Aug 23 15:49:34 2023 -0700" }, "message": "Merge Android U (ab/10368041)\n\nBug: 291102124\nMerged-In: I292cd07db6611b4d5782bee47ba0ca910bd96456\nChange-Id: Iea86ead433ee2807a25a799ce7a30a6e35be2d36\n" }, { "commit": "4b1f51cb2222b6653f2cce6f588f1463cb8e92ca", "tree": "6cc1200946b9d6f023d343004a34de277a01c076", "parents": [ "dcb1895fa6a499e62892aae92d401cb37afb0f13", "34e9717d9cf3eba88b8b5de6a4ba167fe0e7b524" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Aug 23 19:54:56 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 23 19:54:56 2023 +0000" }, "message": "Merge \"Updated paths for py_proto_library\" into main am: af1fed95c5 am: d963bb2fc7 am: 6a3106ba9b am: 3466cf813e am: 34e9717d9c\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2721816\n\nChange-Id: I02053829613660be40358e8aaeadaf74833663c9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "34e9717d9cf3eba88b8b5de6a4ba167fe0e7b524", "tree": "c7fe14d0fb063b9e25cc32a207a3c20a41c9c1d5", "parents": [ "fb8ebc99717c6f7f068b2658c82608e7524da3e9", "3466cf813e742e71c3d0d2588b8c7a965e6d5a1b" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Aug 23 19:07:17 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 23 19:07:17 2023 +0000" }, "message": "Merge \"Updated paths for py_proto_library\" into main am: af1fed95c5 am: d963bb2fc7 am: 6a3106ba9b am: 3466cf813e\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2721816\n\nChange-Id: Ic659ee9c98bb058c3068536018f7033fb08b4b83\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" } ], "next": "3466cf813e742e71c3d0d2588b8c7a965e6d5a1b" }