)]}'
{
  "log": [
    {
      "commit": "0cb74b5a1fd2f5360c42f157aa452048d8378119",
      "tree": "182a27d385d6060263a50ca03ab9bca0aaef5bb1",
      "parents": [
        "004c45b57bb57746ffed524f4f8590685f2dd42e",
        "02cbb48fb78f11bd9b52b41d0ff4f40482f1a07f"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Mar 26 15:27:09 2025 -0700"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Wed Mar 26 15:27:09 2025 -0700"
      },
      "message": "[automerger skipped] Revert \"DO NOT MERGE: Revert \"Update test certs for CertBlocklistTest\"\" am: 23a48a20c2 -s ours am: d2c5398dfb -s ours am: 887c3951dd -s ours am: f188e11ef5 -s ours am: c2b2cefe58 -s ours am: 95a92dbd36 -s ours am: 3963cda5c8 -s ours am: 02cbb48fb7 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3561426\n\nChange-Id: I77a8499b785f816e42a51e210d0523061b86a672\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "02cbb48fb78f11bd9b52b41d0ff4f40482f1a07f",
      "tree": "3b5fc9da66eb3e664910a6d289b8106f7468e3a8",
      "parents": [
        "1bf4bcf9be921080b7ea8b2df003984644b8bce2",
        "3963cda5c8a3361ccd2e6e35a23f25ddae774a5f"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Mar 26 15:01:41 2025 -0700"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Wed Mar 26 15:01:41 2025 -0700"
      },
      "message": "[automerger skipped] Revert \"DO NOT MERGE: Revert \"Update test certs for CertBlocklistTest\"\" am: 23a48a20c2 -s ours am: d2c5398dfb -s ours am: 887c3951dd -s ours am: f188e11ef5 -s ours am: c2b2cefe58 -s ours am: 95a92dbd36 -s ours am: 3963cda5c8 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3561426\n\nChange-Id: I8f558ab3be6489b8722a0f5bc8546f8bc5cc5fbf\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "3963cda5c8a3361ccd2e6e35a23f25ddae774a5f",
      "tree": "24142973cc294ce830dbd72ec2b09515f3651d77",
      "parents": [
        "70c1a9fbdcbbdb005936ebd55add0c504396c424",
        "95a92dbd36733932392b78d166a060b971476809"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Mar 26 14:37:43 2025 -0700"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Wed Mar 26 14:37:43 2025 -0700"
      },
      "message": "[automerger skipped] Revert \"DO NOT MERGE: Revert \"Update test certs for CertBlocklistTest\"\" am: 23a48a20c2 -s ours am: d2c5398dfb -s ours am: 887c3951dd -s ours am: f188e11ef5 -s ours am: c2b2cefe58 -s ours am: 95a92dbd36 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3561426\n\nChange-Id: I987239308c7d85e9570710accc471551acbd1bae\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "95a92dbd36733932392b78d166a060b971476809",
      "tree": "4f13ad3194b9c8f509d439e9752d8f32e884f97d",
      "parents": [
        "7ae1646abadf8c720cc8471722057b2d3ae2aec0",
        "c2b2cefe58130bcf8523ffdaa03a169cfc4fc58a"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Mar 26 14:14:39 2025 -0700"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Wed Mar 26 14:14:39 2025 -0700"
      },
      "message": "[automerger skipped] Revert \"DO NOT MERGE: Revert \"Update test certs for CertBlocklistTest\"\" am: 23a48a20c2 -s ours am: d2c5398dfb -s ours am: 887c3951dd -s ours am: f188e11ef5 -s ours am: c2b2cefe58 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3561426\n\nChange-Id: Ie3498d86345257cef51b931185ec500b67ee92ad\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "c2b2cefe58130bcf8523ffdaa03a169cfc4fc58a",
      "tree": "eb6d3cce7d9337f0afadfab5b4631baf9acbf5a3",
      "parents": [
        "4bbb99d85c0ac6f2a4296929f66b91d19d46dcca",
        "f188e11ef50114353348306144573d9521cf62ce"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Mar 26 13:49:55 2025 -0700"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Wed Mar 26 13:49:55 2025 -0700"
      },
      "message": "[automerger skipped] Revert \"DO NOT MERGE: Revert \"Update test certs for CertBlocklistTest\"\" am: 23a48a20c2 -s ours am: d2c5398dfb -s ours am: 887c3951dd -s ours am: f188e11ef5 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3561426\n\nChange-Id: I9fb3b8b02075f2c52b3f69ed33923741e998cc6c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "f188e11ef50114353348306144573d9521cf62ce",
      "tree": "59917ff6ace5a5baf610fb2859dc288f265ca963",
      "parents": [
        "95d1b4a461e020a2eb66af6e5b317b1e1c67cd6f",
        "887c3951ddbe7eba4543be9892388480b6bba561"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Mar 26 13:25:55 2025 -0700"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Wed Mar 26 13:25:55 2025 -0700"
      },
      "message": "[automerger skipped] Revert \"DO NOT MERGE: Revert \"Update test certs for CertBlocklistTest\"\" am: 23a48a20c2 -s ours am: d2c5398dfb -s ours am: 887c3951dd -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3561426\n\nChange-Id: I684a8d92c9a0a50e37ac8e79c888d7e4d39daf19\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "887c3951ddbe7eba4543be9892388480b6bba561",
      "tree": "18334ee64e42e611c3e7ff7bae06637d78385aac",
      "parents": [
        "a829fa9289c1c936e9857b4da44c580fb3d0ae5b",
        "d2c5398dfb5d3d7716f72b000f1fc6cb32a89838"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Mar 26 13:02:56 2025 -0700"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Wed Mar 26 13:02:56 2025 -0700"
      },
      "message": "[automerger skipped] Revert \"DO NOT MERGE: Revert \"Update test certs for CertBlocklistTest\"\" am: 23a48a20c2 -s ours am: d2c5398dfb -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3561426\n\nChange-Id: I0083af54f3b864cc37fc4d5c0a00ae4d728fc174\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "d2c5398dfb5d3d7716f72b000f1fc6cb32a89838",
      "tree": "67169becca9af0dbd4a4d795cf6f9f7dc60874f9",
      "parents": [
        "46503f287423eb69a1f1e5fec03f7b8d705490e1",
        "23a48a20c209b3e6cc90964a4626b0d1f0f7a4e9"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Mar 26 12:37:53 2025 -0700"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Wed Mar 26 12:37:53 2025 -0700"
      },
      "message": "[automerger skipped] Revert \"DO NOT MERGE: Revert \"Update test certs for CertBlocklistTest\"\" am: 23a48a20c2 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3561426\n\nChange-Id: Ia15e02ae178f27849a15d7b981a8fe5344250300\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "004c45b57bb57746ffed524f4f8590685f2dd42e",
      "tree": "182a27d385d6060263a50ca03ab9bca0aaef5bb1",
      "parents": [
        "58d261bb3defd3bb1f3e721b259a7c3ab1285fb1",
        "1bf4bcf9be921080b7ea8b2df003984644b8bce2"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Mar 26 09:09:26 2025 -0700"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Wed Mar 26 09:09:26 2025 -0700"
      },
      "message": "[automerger skipped] DO NOT MERGE: Revert \"Update test certs for CertBlocklistTest\" am: 10c1553326 -s ours am: 46503f2874 -s ours am: a829fa9289 -s ours am: 95d1b4a461 -s ours am: 4bbb99d85c -s ours am: 7ae1646aba -s ours am: 70c1a9fbdc -s ours am: 1bf4bcf9be -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3557990\n\nChange-Id: I2105da975052d661da30e8aafd6289c65d3a8d27\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "1bf4bcf9be921080b7ea8b2df003984644b8bce2",
      "tree": "3b5fc9da66eb3e664910a6d289b8106f7468e3a8",
      "parents": [
        "a2c2197e238c62ccc150f3afb3f8118836335f91",
        "70c1a9fbdcbbdb005936ebd55add0c504396c424"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Mar 26 08:43:07 2025 -0700"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Wed Mar 26 08:43:07 2025 -0700"
      },
      "message": "[automerger skipped] DO NOT MERGE: Revert \"Update test certs for CertBlocklistTest\" am: 10c1553326 -s ours am: 46503f2874 -s ours am: a829fa9289 -s ours am: 95d1b4a461 -s ours am: 4bbb99d85c -s ours am: 7ae1646aba -s ours am: 70c1a9fbdc -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3557990\n\nChange-Id: I71523ea34578e60856c5d08c48c109bffa6bdd5b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "70c1a9fbdcbbdb005936ebd55add0c504396c424",
      "tree": "24142973cc294ce830dbd72ec2b09515f3651d77",
      "parents": [
        "cec05584830c4fc1e5bcb3674d705bcddb1e8573",
        "7ae1646abadf8c720cc8471722057b2d3ae2aec0"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Mar 26 08:19:00 2025 -0700"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Wed Mar 26 08:19:00 2025 -0700"
      },
      "message": "[automerger skipped] DO NOT MERGE: Revert \"Update test certs for CertBlocklistTest\" am: 10c1553326 -s ours am: 46503f2874 -s ours am: a829fa9289 -s ours am: 95d1b4a461 -s ours am: 4bbb99d85c -s ours am: 7ae1646aba -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3557990\n\nChange-Id: I5d8aaad783964f4b15d98efcf6334dcf4824768a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "7ae1646abadf8c720cc8471722057b2d3ae2aec0",
      "tree": "4f13ad3194b9c8f509d439e9752d8f32e884f97d",
      "parents": [
        "ceb61b3362e0c31d0b0dfac3ca1c82fb4f46d0b4",
        "4bbb99d85c0ac6f2a4296929f66b91d19d46dcca"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Mar 26 07:56:11 2025 -0700"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Wed Mar 26 07:56:11 2025 -0700"
      },
      "message": "[automerger skipped] DO NOT MERGE: Revert \"Update test certs for CertBlocklistTest\" am: 10c1553326 -s ours am: 46503f2874 -s ours am: a829fa9289 -s ours am: 95d1b4a461 -s ours am: 4bbb99d85c -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3557990\n\nChange-Id: I26e36a54329f03491014b2d83012beb73458b603\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "4bbb99d85c0ac6f2a4296929f66b91d19d46dcca",
      "tree": "eb6d3cce7d9337f0afadfab5b4631baf9acbf5a3",
      "parents": [
        "79b5a15f2914dc637c7dec800714aa8fcc4a8819",
        "95d1b4a461e020a2eb66af6e5b317b1e1c67cd6f"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Mar 26 07:31:21 2025 -0700"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Wed Mar 26 07:31:21 2025 -0700"
      },
      "message": "[automerger skipped] DO NOT MERGE: Revert \"Update test certs for CertBlocklistTest\" am: 10c1553326 -s ours am: 46503f2874 -s ours am: a829fa9289 -s ours am: 95d1b4a461 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3557990\n\nChange-Id: I6612e87a7c0468a9ca6f1a3588c7b171d47d94e8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "95d1b4a461e020a2eb66af6e5b317b1e1c67cd6f",
      "tree": "59917ff6ace5a5baf610fb2859dc288f265ca963",
      "parents": [
        "4c11627700ec287caeb47f5d0e8b67e717302ba4",
        "a829fa9289c1c936e9857b4da44c580fb3d0ae5b"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Mar 26 07:07:15 2025 -0700"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Wed Mar 26 07:07:15 2025 -0700"
      },
      "message": "[automerger skipped] DO NOT MERGE: Revert \"Update test certs for CertBlocklistTest\" am: 10c1553326 -s ours am: 46503f2874 -s ours am: a829fa9289 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3557990\n\nChange-Id: I60d5fafd0a094702da35af1f8a85a8c98af2cad4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "a829fa9289c1c936e9857b4da44c580fb3d0ae5b",
      "tree": "18334ee64e42e611c3e7ff7bae06637d78385aac",
      "parents": [
        "018e91cd959156b96bc4438d616533df1a9754dd",
        "46503f287423eb69a1f1e5fec03f7b8d705490e1"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Mar 26 06:55:11 2025 -0700"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Wed Mar 26 06:55:11 2025 -0700"
      },
      "message": "[automerger skipped] DO NOT MERGE: Revert \"Update test certs for CertBlocklistTest\" am: 10c1553326 -s ours am: 46503f2874 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3557990\n\nChange-Id: I4005488bf32415523e49eb1ca093a3b00e66fe8c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "46503f287423eb69a1f1e5fec03f7b8d705490e1",
      "tree": "67169becca9af0dbd4a4d795cf6f9f7dc60874f9",
      "parents": [
        "4489f1889b3b7629c0763e7a4ccdacd77c4a34d2",
        "10c1553326cdf0031ad58c01060ca0c20ecc5c51"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Mar 26 06:31:19 2025 -0700"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Wed Mar 26 06:31:19 2025 -0700"
      },
      "message": "[automerger skipped] DO NOT MERGE: Revert \"Update test certs for CertBlocklistTest\" am: 10c1553326 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3557990\n\nChange-Id: Id16d21a84ec153d72574c99be26ea944e549be98\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "23a48a20c209b3e6cc90964a4626b0d1f0f7a4e9",
      "tree": "84b5381399d2cab0aee7d76f41e84cc20f3cf9ce",
      "parents": [
        "10c1553326cdf0031ad58c01060ca0c20ecc5c51"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Mar 26 06:12:59 2025 -0700"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Wed Mar 26 06:12:59 2025 -0700"
      },
      "message": "Revert \"DO NOT MERGE: Revert \"Update test certs for CertBlocklistTest\"\"\n\nThis reverts commit 10c1553326cdf0031ad58c01060ca0c20ecc5c51.\n\nReason for revert: Only reverted in hopes rereverting makes this go into the CI\n\nChange-Id: I58cc5e501e30fab8993ca2c679bd542410b8798c\n"
    },
    {
      "commit": "10c1553326cdf0031ad58c01060ca0c20ecc5c51",
      "tree": "8037a3cb3f85c358855c91cc13fde2c3054db00b",
      "parents": [
        "00e8fa42f8ba0f8de7a5ea3b1fcda0fc0e236fe4"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Tue Mar 25 07:49:28 2025 -0700"
      },
      "committer": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Mar 26 04:11:57 2025 -0700"
      },
      "message": "DO NOT MERGE: Revert \"Update test certs for CertBlocklistTest\"\n\nThis reverts commit 00e8fa42f8ba0f8de7a5ea3b1fcda0fc0e236fe4.\n\nReason for revert: This for some reason didn\u0027t go into the CI so I\u0027m hoping re-reversion solves that?\n\nChange-Id: Idad785251feaac54b33c28335e7034f18b50d6ca\nMerged-Id: Idad785251feaac54b33c28335e7034f18b50d6ca\n"
    },
    {
      "commit": "58d261bb3defd3bb1f3e721b259a7c3ab1285fb1",
      "tree": "182a27d385d6060263a50ca03ab9bca0aaef5bb1",
      "parents": [
        "66df1260209a769d691c8181fbd5cf2342992802"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Mar 19 03:05:10 2025 -0700"
      },
      "committer": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Mar 19 03:05:10 2025 -0700"
      },
      "message": "Correct traces for spake native_crypto code.\n\nTest: N/A\nChange-Id: Ifaf6671aa238b1bdcb09b57ab78a70f076aea070\n"
    },
    {
      "commit": "66df1260209a769d691c8181fbd5cf2342992802",
      "tree": "892c8728acf62d15f4e1ca6ff972e950583beff1",
      "parents": [
        "87e962cda98871448a3bf205b4e1d77e97c1dc2b",
        "3870d069dd545af30abdd25383a30fd95c356a66"
      ],
      "author": {
        "name": "Thiébaud Weksteen",
        "email": "tweek@google.com",
        "time": "Tue Mar 18 02:37:53 2025 -0700"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Tue Mar 18 02:37:53 2025 -0700"
      },
      "message": "Merge \"CT: Support static-ct-api logs\" into main"
    },
    {
      "commit": "3870d069dd545af30abdd25383a30fd95c356a66",
      "tree": "7d864149038f62a88679f661bcc3cbc04246882d",
      "parents": [
        "8fbdcf143cb633e5691f44506c5457af096c7d1e"
      ],
      "author": {
        "name": "Thiébaud Weksteen",
        "email": "tweek@google.com",
        "time": "Tue Mar 04 15:27:17 2025 +1100"
      },
      "committer": {
        "name": "Thiébaud Weksteen",
        "email": "tweek@google.com",
        "time": "Tue Mar 18 16:07:35 2025 +1100"
      },
      "message": "CT: Support static-ct-api logs\n\nUpdate the policy to support Static API logs as described in the\nannouncement email [1]. Add an enum to LogInfo to capture the type of\nlog (TYPE_RFC6962 or TYPE_STATIC). Add NO_RFC6962_LOG to\nPolicyCompliance enum to capture the new failure.\n\nBump the compatibility version to 2.\n\nRemove the URL field from the LogInfo (not used).\n\n[1] https://groups.google.com/a/chromium.org/g/ct-policy/c/HBFZHG0TCsY\n\nBug: 377276991\nTest: atest ConscryptPrivateTestCases\nChange-Id: Id8077646816451d1b75407e029765dd40e9b3f93\n"
    },
    {
      "commit": "87e962cda98871448a3bf205b4e1d77e97c1dc2b",
      "tree": "39ed810b80e940d337e4ee4047aa679465ef99d4",
      "parents": [
        "8fbdcf143cb633e5691f44506c5457af096c7d1e",
        "b7857f90453fa4a6de80677b30b40a36804f401e"
      ],
      "author": {
        "name": "Treehugger Robot",
        "email": "android-test-infra-autosubmit@system.gserviceaccount.com",
        "time": "Thu Mar 13 19:14:56 2025 -0700"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Thu Mar 13 19:14:56 2025 -0700"
      },
      "message": "Merge \"Open libconscrypt_openjdk_jni visibility for otatools-package\" into main"
    },
    {
      "commit": "8fbdcf143cb633e5691f44506c5457af096c7d1e",
      "tree": "bc1438b5509538e5c30a226493ad9c7f50f0d242",
      "parents": [
        "202713e4445b5876b44123eb1aea9ee1962db1d0",
        "4baaba997cefeea5390c5e132e6e4b1cf5681fca"
      ],
      "author": {
        "name": "Thiébaud Weksteen",
        "email": "tweek@google.com",
        "time": "Wed Mar 12 16:47:59 2025 -0700"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Wed Mar 12 16:47:59 2025 -0700"
      },
      "message": "Merge \"Remove reference to InternalUtil\" into main"
    },
    {
      "commit": "b7857f90453fa4a6de80677b30b40a36804f401e",
      "tree": "ae07b38875b8feec74479c427250a45b582d4465",
      "parents": [
        "1ebb06ad9cb5f07b323296c4aeff4d0ed43a3d39"
      ],
      "author": {
        "name": "Herbert Xue",
        "email": "herbertxue@google.com",
        "time": "Fri Mar 07 11:41:38 2025 +0800"
      },
      "committer": {
        "name": "Herbert Xue",
        "email": "herbertxue@google.com",
        "time": "Wed Mar 12 14:08:06 2025 +0800"
      },
      "message": "Open libconscrypt_openjdk_jni visibility for otatools-package\n\nBug: 395988167\nTest: m dist otatools-package-temp\nChange-Id: I022ec33c57d31b6cb3fbd47bdc3bd994cac112cb\n"
    },
    {
      "commit": "4baaba997cefeea5390c5e132e6e4b1cf5681fca",
      "tree": "f7870359da814c1473e816346226280f08620bfe",
      "parents": [
        "cff3692882c39499a5d2fd1a7f8b2503efc7088c"
      ],
      "author": {
        "name": "Thiébaud Weksteen",
        "email": "tweek@google.com",
        "time": "Wed Mar 12 12:20:37 2025 +1100"
      },
      "committer": {
        "name": "Thiébaud Weksteen",
        "email": "tweek@google.com",
        "time": "Wed Mar 12 12:20:37 2025 +1100"
      },
      "message": "Remove reference to InternalUtil\n\nRerun srcgen/generate_android_src.sh\n\nTest: presubmit\nChange-Id: Iee92284206017a6792b53ba989d77b3b842d0173\n"
    },
    {
      "commit": "202713e4445b5876b44123eb1aea9ee1962db1d0",
      "tree": "bb409a38e5ab2e057cc5d48b59a007c62bb02838",
      "parents": [
        "1ebb06ad9cb5f07b323296c4aeff4d0ed43a3d39",
        "88b82438a4bfbbbdc9f2bb859169a023f0ffbd2f"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Tue Mar 11 11:09:05 2025 -0700"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Tue Mar 11 11:09:05 2025 -0700"
      },
      "message": "Merge \"Implement PakeOption \u0027client-handshake-limit\u0027 and \u0027server-handshake-limit\u0027 for SPAKE2+ connections.\" into main"
    },
    {
      "commit": "88b82438a4bfbbbdc9f2bb859169a023f0ffbd2f",
      "tree": "bb409a38e5ab2e057cc5d48b59a007c62bb02838",
      "parents": [
        "cff3692882c39499a5d2fd1a7f8b2503efc7088c"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Tue Mar 11 08:26:53 2025 -0700"
      },
      "committer": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Tue Mar 11 08:26:53 2025 -0700"
      },
      "message": "Implement PakeOption \u0027client-handshake-limit\u0027 and \u0027server-handshake-limit\u0027 for SPAKE2+ connections.\n\nWhen \u0027client-handshake-limit\u0027 and \u0027server-handshake-limit\u0027 are present in a\nSPAKE2+ PakeOption, they will be used to control the number of unsuccessful/pending\nSPAKE2+ attempts that can be performed by the client and server, respectively,\nbefore failing the connection.\n\nThe default limit is 1 if not provided.\n\nBug: 401039265\nTest: atest SpakeTest\nChange-Id: Ia87fbef5778e6773b3103863ce19550484f9b90f\n"
    },
    {
      "commit": "1ebb06ad9cb5f07b323296c4aeff4d0ed43a3d39",
      "tree": "9ecfa1ba327194109a39c54a1960a8c7965c1b9e",
      "parents": [
        "02cf7b578307437ae967d698536e2e7bfcba4c99",
        "cff3692882c39499a5d2fd1a7f8b2503efc7088c"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Mon Mar 03 14:10:00 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Mon Mar 03 14:10:00 2025 -0800"
      },
      "message": "[automerger skipped] Make assertValidCipherSuites more resistant to changes. am: 018e91cd95 am: 4c11627700 am: 79b5a15f29 -s ours am: ceb61b3362 -s ours am: cec0558483 -s ours am: a2c2197e23 -s ours am: cff3692882 -s ours\n\nam skip reason: Merged-In Ib634f3e535d64fb7009bf52bfd5d3b88599cf4c5 with SHA-1 ca5ba46d3d is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3516812\n\nChange-Id: I15801d0ed736f41519f867b18d3bfa46b86cb993\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "cff3692882c39499a5d2fd1a7f8b2503efc7088c",
      "tree": "9ecfa1ba327194109a39c54a1960a8c7965c1b9e",
      "parents": [
        "45ecfca331aeb3603dce0b7ddd8a065c3d732d7c",
        "a2c2197e238c62ccc150f3afb3f8118836335f91"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Mon Mar 03 13:47:50 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Mon Mar 03 13:47:50 2025 -0800"
      },
      "message": "[automerger skipped] Make assertValidCipherSuites more resistant to changes. am: 018e91cd95 am: 4c11627700 am: 79b5a15f29 -s ours am: ceb61b3362 -s ours am: cec0558483 -s ours am: a2c2197e23 -s ours\n\nam skip reason: Merged-In Ib634f3e535d64fb7009bf52bfd5d3b88599cf4c5 with SHA-1 ca5ba46d3d is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3516812\n\nChange-Id: Ia20424b31b587039227af2973d37bc0a3d4a1236\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "a2c2197e238c62ccc150f3afb3f8118836335f91",
      "tree": "3b5fc9da66eb3e664910a6d289b8106f7468e3a8",
      "parents": [
        "83ef59921fddc0a0aaaf4207412ec4a87e3cf054",
        "cec05584830c4fc1e5bcb3674d705bcddb1e8573"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Mon Mar 03 13:33:35 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Mon Mar 03 13:33:35 2025 -0800"
      },
      "message": "[automerger skipped] Make assertValidCipherSuites more resistant to changes. am: 018e91cd95 am: 4c11627700 am: 79b5a15f29 -s ours am: ceb61b3362 -s ours am: cec0558483 -s ours\n\nam skip reason: Merged-In Ib634f3e535d64fb7009bf52bfd5d3b88599cf4c5 with SHA-1 ca5ba46d3d is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3516812\n\nChange-Id: I72f12aabfcf48596fc21865b5a5ea174fc909529\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "cec05584830c4fc1e5bcb3674d705bcddb1e8573",
      "tree": "24142973cc294ce830dbd72ec2b09515f3651d77",
      "parents": [
        "ec29e0f580627b1cdb1657e5116571882606bea6",
        "ceb61b3362e0c31d0b0dfac3ca1c82fb4f46d0b4"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Mon Mar 03 13:06:56 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Mon Mar 03 13:06:56 2025 -0800"
      },
      "message": "[automerger skipped] Make assertValidCipherSuites more resistant to changes. am: 018e91cd95 am: 4c11627700 am: 79b5a15f29 -s ours am: ceb61b3362 -s ours\n\nam skip reason: Merged-In Ib634f3e535d64fb7009bf52bfd5d3b88599cf4c5 with SHA-1 ca5ba46d3d is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3516812\n\nChange-Id: If7e7f6ea064733a111d1f4dc9a22e6c96abee137\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "ceb61b3362e0c31d0b0dfac3ca1c82fb4f46d0b4",
      "tree": "4f13ad3194b9c8f509d439e9752d8f32e884f97d",
      "parents": [
        "5afefbcd75d36add6be6406168f8a78f4d78c7af",
        "79b5a15f2914dc637c7dec800714aa8fcc4a8819"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Mon Mar 03 12:43:41 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Mon Mar 03 12:43:41 2025 -0800"
      },
      "message": "[automerger skipped] Make assertValidCipherSuites more resistant to changes. am: 018e91cd95 am: 4c11627700 am: 79b5a15f29 -s ours\n\nam skip reason: Merged-In Ib634f3e535d64fb7009bf52bfd5d3b88599cf4c5 with SHA-1 ca5ba46d3d is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3516812\n\nChange-Id: Ic81fc75a673c7b58eb5f4e02c4430e16393bebfa\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "79b5a15f2914dc637c7dec800714aa8fcc4a8819",
      "tree": "eb6d3cce7d9337f0afadfab5b4631baf9acbf5a3",
      "parents": [
        "b3498ceb893b6698218e4ef5f8db237b5f6eae59",
        "4c11627700ec287caeb47f5d0e8b67e717302ba4"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Mon Mar 03 12:19:31 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Mon Mar 03 12:19:31 2025 -0800"
      },
      "message": "Make assertValidCipherSuites more resistant to changes. am: 018e91cd95 am: 4c11627700\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3516812\n\nChange-Id: Ie41dfa40d3f4210a75cf02f27f3cd79b235390bf\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "4c11627700ec287caeb47f5d0e8b67e717302ba4",
      "tree": "59917ff6ace5a5baf610fb2859dc288f265ca963",
      "parents": [
        "832b40b43bbdabbf9a7fc32c96d592204b68b271",
        "018e91cd959156b96bc4438d616533df1a9754dd"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Mon Mar 03 11:55:30 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Mon Mar 03 11:55:30 2025 -0800"
      },
      "message": "Make assertValidCipherSuites more resistant to changes. am: 018e91cd95\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3516812\n\nChange-Id: I8528249fbbac1fd07adba5d302dfc54b3f305b8b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "018e91cd959156b96bc4438d616533df1a9754dd",
      "tree": "18334ee64e42e611c3e7ff7bae06637d78385aac",
      "parents": [
        "9c14a576eb250289e7416b2975aa8c7e048bf0b6"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Fri Jan 10 01:49:00 2025 -0800"
      },
      "committer": {
        "name": "Long Cheng",
        "email": "lgcheng@google.com",
        "time": "Fri Feb 28 11:56:14 2025 -0800"
      },
      "message": "Make assertValidCipherSuites more resistant to changes.\n\nBug: 382218726\nBug: 396969645\n(cherry picked from https://android-review.googlesource.com/q/commit:d513dfebee2a808c1b5e41ad5a8069255725ceed)\n(cherry picked from https://android-review.googlesource.com/q/commit:c70f2ace374a258dc69315484ecc4c8dfbc9e2cd)\n(cherry picked from https://android-review.googlesource.com/q/commit:ca5ba46d3d0ee1af755caf1582a4ad1554e650cd)\nMerged-In: Ib634f3e535d64fb7009bf52bfd5d3b88599cf4c5\nChange-Id: Ib634f3e535d64fb7009bf52bfd5d3b88599cf4c5\n"
    },
    {
      "commit": "02cf7b578307437ae967d698536e2e7bfcba4c99",
      "tree": "9ecfa1ba327194109a39c54a1960a8c7965c1b9e",
      "parents": [
        "9662a1944d5d2e5b44b590c2ced4564ea1dd9130",
        "45ecfca331aeb3603dce0b7ddd8a065c3d732d7c"
      ],
      "author": {
        "name": "Paul Duffin",
        "email": "paulduffin@google.com",
        "time": "Fri Feb 28 02:00:32 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Fri Feb 28 02:00:32 2025 -0800"
      },
      "message": "Include annotations in conscrypt platform and intracore APIs am: 45ecfca331\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3514370\n\nChange-Id: Ie144272914d4d65990925cd5c20093b9b00a3f1d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "45ecfca331aeb3603dce0b7ddd8a065c3d732d7c",
      "tree": "9ecfa1ba327194109a39c54a1960a8c7965c1b9e",
      "parents": [
        "a132ccab9cadeca91aecbf238b9ec9702d048119"
      ],
      "author": {
        "name": "Paul Duffin",
        "email": "paulduffin@google.com",
        "time": "Thu Feb 27 16:55:51 2025 +0000"
      },
      "committer": {
        "name": "Paul Duffin",
        "email": "paulduffin@google.com",
        "time": "Thu Feb 27 18:42:54 2025 +0000"
      },
      "message": "Include annotations in conscrypt platform and intracore APIs\n\nPreviously, annotations were not included. This change added\n`annotations_enabled: true` to both modules to fix that.\n\nBug: 399365344\nTest: # Compare the contents of out/soong/.intermediates/external/conscrypt/conscrypt.module.intra.core.api.stubs.source/android_common/everything/conscrypt.module.intra.core.api.stubs.source-stubs.srcjar\n      # before and after this change.\n      TH\nChange-Id: Id6361c10ef3b2430dd0a3c4e2670d2ad5f0c8e41\n"
    },
    {
      "commit": "9662a1944d5d2e5b44b590c2ced4564ea1dd9130",
      "tree": "419d9ccbbd10cd137f618d1c944f34a54d4c0e13",
      "parents": [
        "3dbbb03cada69d04179d83414c380eeef29dc1b9",
        "a132ccab9cadeca91aecbf238b9ec9702d048119"
      ],
      "author": {
        "name": "Paul Duffin",
        "email": "paulduffin@google.com",
        "time": "Wed Feb 26 08:01:55 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Wed Feb 26 08:01:55 2025 -0800"
      },
      "message": "Merge \"Remove from/to attributes from libcore.util.Nullable/NonNull\" into main am: a132ccab9c\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3507499\n\nChange-Id: Id6c5456300648690d0e8ab73154bc61bdc31fe37\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "a132ccab9cadeca91aecbf238b9ec9702d048119",
      "tree": "419d9ccbbd10cd137f618d1c944f34a54d4c0e13",
      "parents": [
        "61b5cda3fa5abcf7aca62e629b2804688eb1815b",
        "3a727c2ac7345b6db47d7c46617cd76f995cc202"
      ],
      "author": {
        "name": "Paul Duffin",
        "email": "paulduffin@google.com",
        "time": "Wed Feb 26 07:35:45 2025 -0800"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Wed Feb 26 07:35:45 2025 -0800"
      },
      "message": "Merge \"Remove from/to attributes from libcore.util.Nullable/NonNull\" into main"
    },
    {
      "commit": "3a727c2ac7345b6db47d7c46617cd76f995cc202",
      "tree": "fc6d27a03f6e4a8cac47aadf683babdc39a26070",
      "parents": [
        "3f17f3262b90952583053d004519cb9d02319207"
      ],
      "author": {
        "name": "Paul Duffin",
        "email": "paulduffin@google.com",
        "time": "Tue Feb 25 19:36:50 2025 +0000"
      },
      "committer": {
        "name": "Paul Duffin",
        "email": "paulduffin@google.com",
        "time": "Tue Feb 25 19:38:27 2025 +0000"
      },
      "message": "Remove from/to attributes from libcore.util.Nullable/NonNull\n\nThe attributes are not used, either in the code, or in Metalava and\ntheir presence prevents mapping them to other, more common nullability\nannotations like those in `android.annotation` or `androidx.annotation`\nas Metalava needs to do when generating the stubs.\n\nMatches the changes made in https://r.android.com/3508044.\n\nBug: 311619997\nTest: m checkbuild\nChange-Id: Icf0ee4fa4c6510cdd2a2c9921ef333fd568f1a91\n"
    },
    {
      "commit": "3dbbb03cada69d04179d83414c380eeef29dc1b9",
      "tree": "a8d0fcbc6e246f8c54c9f944cd869bf013308ebc",
      "parents": [
        "db2bddca58e223c599f644939de3a88d63c6db29",
        "61b5cda3fa5abcf7aca62e629b2804688eb1815b"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Thu Feb 20 07:11:49 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Thu Feb 20 07:11:49 2025 -0800"
      },
      "message": "Merge \"Remove unnecesary Spake-related imports\" into main am: 61b5cda3fa\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3501611\n\nChange-Id: I1744373937f128232f211834a603b2277dd49f9b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "61b5cda3fa5abcf7aca62e629b2804688eb1815b",
      "tree": "a8d0fcbc6e246f8c54c9f944cd869bf013308ebc",
      "parents": [
        "cc7882dd00fbfff28eb610bc98169c14fa28da45",
        "d3bcfc6c38056510e0a44096fee09418c9da7e22"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Thu Feb 20 06:09:44 2025 -0800"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Thu Feb 20 06:09:44 2025 -0800"
      },
      "message": "Merge \"Remove unnecesary Spake-related imports\" into main"
    },
    {
      "commit": "db2bddca58e223c599f644939de3a88d63c6db29",
      "tree": "7220de03afabcca6c1c958dff5b75e37f4f6f122",
      "parents": [
        "40c1ac58b579f6fc089079ef5c6b6078d3c787fc",
        "cc7882dd00fbfff28eb610bc98169c14fa28da45"
      ],
      "author": {
        "name": "Pete Bentley",
        "email": "prb@google.com",
        "time": "Thu Feb 20 05:35:32 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Thu Feb 20 05:35:32 2025 -0800"
      },
      "message": "[automerger skipped] Update test certs for CertBlocklistTest am: 00e8fa42f8 -s ours am: 4489f1889b -s ours am: 9c14a576eb -s ours am: 832b40b43b -s ours am: b3498ceb89 -s ours am: 5afefbcd75 -s ours am: ec29e0f580 -s ours am: 83ef59921f -s ours am: cc7882dd00 -s ours\n\nam skip reason: Merged-In I8ef9a63d5562e45f26b6b5379234c228e1eaa196 with SHA-1 5086938fd9 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3481936\n\nChange-Id: I3446b0149e540a5670009f2734c38cb78ec65636\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "cc7882dd00fbfff28eb610bc98169c14fa28da45",
      "tree": "7220de03afabcca6c1c958dff5b75e37f4f6f122",
      "parents": [
        "963f47a9a80e60e6151b08b9609b1a275be10c29",
        "83ef59921fddc0a0aaaf4207412ec4a87e3cf054"
      ],
      "author": {
        "name": "Pete Bentley",
        "email": "prb@google.com",
        "time": "Thu Feb 20 05:00:26 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Thu Feb 20 05:00:26 2025 -0800"
      },
      "message": "[automerger skipped] Update test certs for CertBlocklistTest am: 00e8fa42f8 -s ours am: 4489f1889b -s ours am: 9c14a576eb -s ours am: 832b40b43b -s ours am: b3498ceb89 -s ours am: 5afefbcd75 -s ours am: ec29e0f580 -s ours am: 83ef59921f -s ours\n\nam skip reason: Merged-In I8ef9a63d5562e45f26b6b5379234c228e1eaa196 with SHA-1 5086938fd9 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3481936\n\nChange-Id: Ia893c367713004f0fd3d04997a53028cb73b9820\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "d3bcfc6c38056510e0a44096fee09418c9da7e22",
      "tree": "a8d0fcbc6e246f8c54c9f944cd869bf013308ebc",
      "parents": [
        "963f47a9a80e60e6151b08b9609b1a275be10c29"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Thu Feb 20 04:00:37 2025 -0800"
      },
      "committer": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Thu Feb 20 04:53:46 2025 -0800"
      },
      "message": "Remove unnecesary Spake-related imports\n\nThese were mistakenly left in after some code related to them was taken out.\n\nChange-Id: Ia3d1c158a3358dac521e5f49a349eae2a0030620\n"
    },
    {
      "commit": "83ef59921fddc0a0aaaf4207412ec4a87e3cf054",
      "tree": "3b5fc9da66eb3e664910a6d289b8106f7468e3a8",
      "parents": [
        "67ed7583ce3ba7c39db06c3c1ad6d4365ed8c0ea",
        "ec29e0f580627b1cdb1657e5116571882606bea6"
      ],
      "author": {
        "name": "Pete Bentley",
        "email": "prb@google.com",
        "time": "Thu Feb 20 04:34:59 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Thu Feb 20 04:34:59 2025 -0800"
      },
      "message": "[automerger skipped] Update test certs for CertBlocklistTest am: 00e8fa42f8 -s ours am: 4489f1889b -s ours am: 9c14a576eb -s ours am: 832b40b43b -s ours am: b3498ceb89 -s ours am: 5afefbcd75 -s ours am: ec29e0f580 -s ours\n\nam skip reason: Merged-In I8ef9a63d5562e45f26b6b5379234c228e1eaa196 with SHA-1 5086938fd9 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3481936\n\nChange-Id: Ie83fec1bdb5f2b0339d2d1df3bed9c90485a6c06\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "ec29e0f580627b1cdb1657e5116571882606bea6",
      "tree": "24142973cc294ce830dbd72ec2b09515f3651d77",
      "parents": [
        "5b50fab8e78b1f7a24588c662cf8ec2905fb924b",
        "5afefbcd75d36add6be6406168f8a78f4d78c7af"
      ],
      "author": {
        "name": "Pete Bentley",
        "email": "prb@google.com",
        "time": "Thu Feb 20 04:11:15 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Thu Feb 20 04:11:15 2025 -0800"
      },
      "message": "[automerger skipped] Update test certs for CertBlocklistTest am: 00e8fa42f8 -s ours am: 4489f1889b -s ours am: 9c14a576eb -s ours am: 832b40b43b -s ours am: b3498ceb89 -s ours am: 5afefbcd75 -s ours\n\nam skip reason: Merged-In I8ef9a63d5562e45f26b6b5379234c228e1eaa196 with SHA-1 5086938fd9 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3481936\n\nChange-Id: Iec6324d35a655bede03c7486fc2fb1fffe0575c9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "5afefbcd75d36add6be6406168f8a78f4d78c7af",
      "tree": "4f13ad3194b9c8f509d439e9752d8f32e884f97d",
      "parents": [
        "ca5ba46d3d0ee1af755caf1582a4ad1554e650cd",
        "b3498ceb893b6698218e4ef5f8db237b5f6eae59"
      ],
      "author": {
        "name": "Pete Bentley",
        "email": "prb@google.com",
        "time": "Thu Feb 20 03:48:02 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Thu Feb 20 03:48:02 2025 -0800"
      },
      "message": "[automerger skipped] Update test certs for CertBlocklistTest am: 00e8fa42f8 -s ours am: 4489f1889b -s ours am: 9c14a576eb -s ours am: 832b40b43b -s ours am: b3498ceb89 -s ours\n\nam skip reason: Merged-In I8ef9a63d5562e45f26b6b5379234c228e1eaa196 with SHA-1 5086938fd9 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3481936\n\nChange-Id: I17189a2dfdad04851aea008320ae3970b39cc609\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "b3498ceb893b6698218e4ef5f8db237b5f6eae59",
      "tree": "538324016142c35ab0335fea9477b32431e364a1",
      "parents": [
        "dfb6211741a37588aa6db2c48498198595518a02",
        "832b40b43bbdabbf9a7fc32c96d592204b68b271"
      ],
      "author": {
        "name": "Pete Bentley",
        "email": "prb@google.com",
        "time": "Thu Feb 20 03:34:45 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Thu Feb 20 03:34:45 2025 -0800"
      },
      "message": "[automerger skipped] Update test certs for CertBlocklistTest am: 00e8fa42f8 -s ours am: 4489f1889b -s ours am: 9c14a576eb -s ours am: 832b40b43b -s ours\n\nam skip reason: Merged-In I8ef9a63d5562e45f26b6b5379234c228e1eaa196 with SHA-1 5086938fd9 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3481936\n\nChange-Id: I9dc7a92c14a0866187579ee9fe57daa4f36c1db7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "832b40b43bbdabbf9a7fc32c96d592204b68b271",
      "tree": "3f462cce7211238a7da1c4fd9bc0b339edfaf031",
      "parents": [
        "1e96e2a3c6671c858658bda76119344ff491d1c5",
        "9c14a576eb250289e7416b2975aa8c7e048bf0b6"
      ],
      "author": {
        "name": "Pete Bentley",
        "email": "prb@google.com",
        "time": "Thu Feb 20 03:10:53 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Thu Feb 20 03:10:53 2025 -0800"
      },
      "message": "[automerger skipped] Update test certs for CertBlocklistTest am: 00e8fa42f8 -s ours am: 4489f1889b -s ours am: 9c14a576eb -s ours\n\nam skip reason: Merged-In I8ef9a63d5562e45f26b6b5379234c228e1eaa196 with SHA-1 5086938fd9 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3481936\n\nChange-Id: Ie6cd1f83301a4a376e7b5ab1df4d642a1a80e5c3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "9c14a576eb250289e7416b2975aa8c7e048bf0b6",
      "tree": "9ee13ad66f00573a47b6fcb2afea6ecc6aa594a4",
      "parents": [
        "36562d970e7b7cbfbb465b11e5c048a556093c6b",
        "4489f1889b3b7629c0763e7a4ccdacd77c4a34d2"
      ],
      "author": {
        "name": "Pete Bentley",
        "email": "prb@google.com",
        "time": "Thu Feb 20 02:47:04 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Thu Feb 20 02:47:04 2025 -0800"
      },
      "message": "[automerger skipped] Update test certs for CertBlocklistTest am: 00e8fa42f8 -s ours am: 4489f1889b -s ours\n\nam skip reason: Merged-In I8ef9a63d5562e45f26b6b5379234c228e1eaa196 with SHA-1 5086938fd9 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3481936\n\nChange-Id: I4ac63df0b13ef7f10e1deb89337359a68ec9b801\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "4489f1889b3b7629c0763e7a4ccdacd77c4a34d2",
      "tree": "67169becca9af0dbd4a4d795cf6f9f7dc60874f9",
      "parents": [
        "3d370b91ffb06059aa24d1b25e3fb855bf28455b",
        "00e8fa42f8ba0f8de7a5ea3b1fcda0fc0e236fe4"
      ],
      "author": {
        "name": "Pete Bentley",
        "email": "prb@google.com",
        "time": "Thu Feb 20 02:24:12 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Thu Feb 20 02:24:12 2025 -0800"
      },
      "message": "[automerger skipped] Update test certs for CertBlocklistTest am: 00e8fa42f8 -s ours\n\nam skip reason: Merged-In I8ef9a63d5562e45f26b6b5379234c228e1eaa196 with SHA-1 5086938fd9 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3481936\n\nChange-Id: I519179a0ca19c37e89158fe20889616fce9e90ea\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "40c1ac58b579f6fc089079ef5c6b6078d3c787fc",
      "tree": "7220de03afabcca6c1c958dff5b75e37f4f6f122",
      "parents": [
        "6ccc2012bf186155b3ca96ee389cb25c22be95b3",
        "963f47a9a80e60e6151b08b9609b1a275be10c29"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Feb 19 08:44:05 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Wed Feb 19 08:44:05 2025 -0800"
      },
      "message": "Move Spake NativeArgs testing to NativeCryptoArgTest am: 963f47a9a8\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3500950\n\nChange-Id: I18d0b0ea4e75d90d832daf5434e320d4b6a55f13\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "963f47a9a80e60e6151b08b9609b1a275be10c29",
      "tree": "7220de03afabcca6c1c958dff5b75e37f4f6f122",
      "parents": [
        "63f1edf32e7be51d007959df653b9ee2394cd203"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Feb 19 06:38:44 2025 -0800"
      },
      "committer": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Feb 19 06:38:44 2025 -0800"
      },
      "message": "Move Spake NativeArgs testing to NativeCryptoArgTest\n\nChange-Id: I36a2fe7e7e1fdf023d3667edd797294079b78e10\nTest: atest NativeCryptoArgTest\n"
    },
    {
      "commit": "6ccc2012bf186155b3ca96ee389cb25c22be95b3",
      "tree": "b006fe1eaa42f9816acd6a5c8739fffa1f2d70e4",
      "parents": [
        "d5f43664612343c9cd863f95957c0a57b494f506",
        "63f1edf32e7be51d007959df653b9ee2394cd203"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Feb 19 04:13:28 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Wed Feb 19 04:13:28 2025 -0800"
      },
      "message": "Merge \"Revert^2 \"Add spake initialization within AbstractSessionContext.\"\" into main am: 63f1edf32e\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3500350\n\nChange-Id: I01757d12ed4362260ac0b93945718cdf99bfe37c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "63f1edf32e7be51d007959df653b9ee2394cd203",
      "tree": "b006fe1eaa42f9816acd6a5c8739fffa1f2d70e4",
      "parents": [
        "e88efec1807d20254c3927d5af66a793afa332fa",
        "39f47d1245ab8754663080fbd78ab0d90d56c62a"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Feb 19 03:49:04 2025 -0800"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Wed Feb 19 03:49:04 2025 -0800"
      },
      "message": "Merge \"Revert^2 \"Add spake initialization within AbstractSessionContext.\"\" into main"
    },
    {
      "commit": "d5f43664612343c9cd863f95957c0a57b494f506",
      "tree": "25dc84e15cea368cc3e486a5dd24b700d69dd7f6",
      "parents": [
        "f847b750579ab917436ad9987fd5f96b1fcc45ec",
        "e88efec1807d20254c3927d5af66a793afa332fa"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Feb 19 03:16:05 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Wed Feb 19 03:16:05 2025 -0800"
      },
      "message": "Merge \"Revert^2 \"Refactor ReflexiveStatsEvent.getSdkVersion into Platform.getTargetSdkVersion\"\" into main am: e88efec180\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3500330\n\nChange-Id: Ib16638ad00584ddd9be5450c83cd2ae329524a7e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "e88efec1807d20254c3927d5af66a793afa332fa",
      "tree": "25dc84e15cea368cc3e486a5dd24b700d69dd7f6",
      "parents": [
        "06183e5eea9667c11766e1e1b375952ba017a93b",
        "f60e0ab0c8f4caa6d32f191080f8c1fa81e03326"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Feb 19 02:48:04 2025 -0800"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Wed Feb 19 02:48:04 2025 -0800"
      },
      "message": "Merge \"Revert^2 \"Refactor ReflexiveStatsEvent.getSdkVersion into Platform.getTargetSdkVersion\"\" into main"
    },
    {
      "commit": "39f47d1245ab8754663080fbd78ab0d90d56c62a",
      "tree": "b5317af97add4f81946a4fd7cb035e047ea4d44c",
      "parents": [
        "d33cf290a8851d28ec85c210d0f8f18e81927a08"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Feb 19 01:38:23 2025 -0800"
      },
      "committer": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Feb 19 01:38:23 2025 -0800"
      },
      "message": "Revert^2 \"Add spake initialization within AbstractSessionContext.\"\n\nThis reverts commit d33cf290a8851d28ec85c210d0f8f18e81927a08.\n\nReason for revert: Resubmit without using readNBytes\n\nChange-Id: I6c4fb717f9818a8c316c744c7511ea801313cfbb\n"
    },
    {
      "commit": "f60e0ab0c8f4caa6d32f191080f8c1fa81e03326",
      "tree": "051c0cc113657b4d82a6d157f4455ac663dd8605",
      "parents": [
        "f56557de80490678c95ec98e16e9d1999e9fbbb8"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Feb 19 01:24:26 2025 -0800"
      },
      "committer": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Feb 19 01:30:57 2025 -0800"
      },
      "message": "Revert^2 \"Refactor ReflexiveStatsEvent.getSdkVersion into Platform.getTargetSdkVersion\"\n\nThis reverts commit f56557de80490678c95ec98e16e9d1999e9fbbb8.\n\nReason for revert: Resubmit with checking for NoSuchMethodException\n\nChange-Id: Iffaa69a82056127202325f7513cc9d53ce4890cb\n"
    },
    {
      "commit": "f847b750579ab917436ad9987fd5f96b1fcc45ec",
      "tree": "7988145c4ffa217b38d3951a4c050fc60a347529",
      "parents": [
        "7a90c706a47d71fc0d5b6ede2ede0ef20424bd78",
        "06183e5eea9667c11766e1e1b375952ba017a93b"
      ],
      "author": {
        "name": "Liana Kazanova (xWF)",
        "email": "lkazanova@google.com",
        "time": "Tue Feb 18 14:57:08 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Tue Feb 18 14:57:08 2025 -0800"
      },
      "message": "Merge \"Revert \"Refactor ReflexiveStatsEvent.getSdkVersion into Platform.getTargetSdkVersion\"\" into main am: 06183e5eea\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3499232\n\nChange-Id: Iab325a4e689cae73f2d5515721928f59b3e01648\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "06183e5eea9667c11766e1e1b375952ba017a93b",
      "tree": "7988145c4ffa217b38d3951a4c050fc60a347529",
      "parents": [
        "eee62d6c8e9e37d18e11d8a286e3db93503cad3a",
        "f56557de80490678c95ec98e16e9d1999e9fbbb8"
      ],
      "author": {
        "name": "Liana Kazanova (xWF)",
        "email": "lkazanova@google.com",
        "time": "Tue Feb 18 14:14:06 2025 -0800"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Tue Feb 18 14:14:06 2025 -0800"
      },
      "message": "Merge \"Revert \"Refactor ReflexiveStatsEvent.getSdkVersion into Platform.getTargetSdkVersion\"\" into main"
    },
    {
      "commit": "7a90c706a47d71fc0d5b6ede2ede0ef20424bd78",
      "tree": "37d6bceac1ed4f51c9409762e3f069e0c18610f4",
      "parents": [
        "a48ebbf0a7ae9e334e99178df85cb87350850c41",
        "eee62d6c8e9e37d18e11d8a286e3db93503cad3a"
      ],
      "author": {
        "name": "Liana Kazanova (xWF)",
        "email": "lkazanova@google.com",
        "time": "Tue Feb 18 12:33:37 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Tue Feb 18 12:33:37 2025 -0800"
      },
      "message": "Merge \"Revert \"Add spake initialization within AbstractSessionContext.\"\" into main am: eee62d6c8e\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3498981\n\nChange-Id: I4abed734c95f1a2ee4bff4e89f92235db127ef66\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "eee62d6c8e9e37d18e11d8a286e3db93503cad3a",
      "tree": "37d6bceac1ed4f51c9409762e3f069e0c18610f4",
      "parents": [
        "3f17f3262b90952583053d004519cb9d02319207",
        "d33cf290a8851d28ec85c210d0f8f18e81927a08"
      ],
      "author": {
        "name": "Liana Kazanova (xWF)",
        "email": "lkazanova@google.com",
        "time": "Tue Feb 18 12:06:04 2025 -0800"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Tue Feb 18 12:06:04 2025 -0800"
      },
      "message": "Merge \"Revert \"Add spake initialization within AbstractSessionContext.\"\" into main"
    },
    {
      "commit": "f56557de80490678c95ec98e16e9d1999e9fbbb8",
      "tree": "5266fef995e319d7e8e70296179db0a096fe7a81",
      "parents": [
        "a2f5f167349cd72ebc12d9e9f72e3ff0f4da3a8a"
      ],
      "author": {
        "name": "Liana Kazanova (xWF)",
        "email": "lkazanova@google.com",
        "time": "Tue Feb 18 12:04:28 2025 -0800"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Tue Feb 18 12:04:28 2025 -0800"
      },
      "message": "Revert \"Refactor ReflexiveStatsEvent.getSdkVersion into Platform.getTargetSdkVersion\"\n\nThis reverts commit a2f5f167349cd72ebc12d9e9f72e3ff0f4da3a8a.\n\nReason for revert: DroidMonitor: Potential culprit for http://b/397437213#comment6  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.\n\nChange-Id: Ied3ad57ed91a60988add60f3231607d675cb4f9d\n"
    },
    {
      "commit": "d33cf290a8851d28ec85c210d0f8f18e81927a08",
      "tree": "7988145c4ffa217b38d3951a4c050fc60a347529",
      "parents": [
        "756b28d00dc82604daea38536a89b34aea670322"
      ],
      "author": {
        "name": "Liana Kazanova (xWF)",
        "email": "lkazanova@google.com",
        "time": "Tue Feb 18 10:20:36 2025 -0800"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Tue Feb 18 10:20:36 2025 -0800"
      },
      "message": "Revert \"Add spake initialization within AbstractSessionContext.\"\n\nThis reverts commit 756b28d00dc82604daea38536a89b34aea670322.\n\nReason for revert: DroidMonitor: Potential culprit for http://b/397437213  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.\n\nChange-Id: I27b82b19d09f116046ca9b584c793148304d7f51\n"
    },
    {
      "commit": "a48ebbf0a7ae9e334e99178df85cb87350850c41",
      "tree": "1edd91fcb2a22aa70bc11af98b6b6a327ff96170",
      "parents": [
        "06317085d8d5587fef132b7a7050271c6671b111",
        "3f17f3262b90952583053d004519cb9d02319207"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Tue Feb 18 07:15:32 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Tue Feb 18 07:15:32 2025 -0800"
      },
      "message": "Merge \"Refactor ReflexiveStatsEvent.getSdkVersion into Platform.getTargetSdkVersion\" into main am: 3f17f3262b\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3415697\n\nChange-Id: I1c2e1868b5024ed77e445ce06c8f7911af1a4d6f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "06317085d8d5587fef132b7a7050271c6671b111",
      "tree": "994c4a6a7e313a709e01ad858d137980ae4b5417",
      "parents": [
        "4006c05aec3607ab6490f09031cde5897458cc75",
        "756b28d00dc82604daea38536a89b34aea670322"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Tue Feb 18 07:15:19 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Tue Feb 18 07:15:19 2025 -0800"
      },
      "message": "Add spake initialization within AbstractSessionContext. am: 756b28d00d\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3487431\n\nChange-Id: I78bc6da7c6c2557ba99bd1b5b2208936f2375524\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "3f17f3262b90952583053d004519cb9d02319207",
      "tree": "1edd91fcb2a22aa70bc11af98b6b6a327ff96170",
      "parents": [
        "756b28d00dc82604daea38536a89b34aea670322",
        "a2f5f167349cd72ebc12d9e9f72e3ff0f4da3a8a"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Tue Feb 18 07:02:19 2025 -0800"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Tue Feb 18 07:02:19 2025 -0800"
      },
      "message": "Merge \"Refactor ReflexiveStatsEvent.getSdkVersion into Platform.getTargetSdkVersion\" into main"
    },
    {
      "commit": "756b28d00dc82604daea38536a89b34aea670322",
      "tree": "994c4a6a7e313a709e01ad858d137980ae4b5417",
      "parents": [
        "285790f177b053656e0bed56887ab382886aee5d"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Tue Feb 18 05:19:11 2025 -0800"
      },
      "committer": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Tue Feb 18 05:19:11 2025 -0800"
      },
      "message": "Add spake initialization within AbstractSessionContext.\n\nThis cl moves spake initialization to happen within AbstractSessionContext so that Ssl_Credentials are added to the SSL_CTX before any SSL objects are created later. It also adds multiple tests for Spake intializations and behavior.\n\nTest: atest SpakeTest\nChange-Id: I453a51b6370b99033837343dfd8e1981076929d8\n"
    },
    {
      "commit": "a2f5f167349cd72ebc12d9e9f72e3ff0f4da3a8a",
      "tree": "f04be94bc4ba66d97aea77bc30026f22f3a321af",
      "parents": [
        "2a58cdb5383a9f9a6b86d28c480fba2fd96a6378"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Tue Feb 18 03:46:03 2025 -0800"
      },
      "committer": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Tue Feb 18 03:46:03 2025 -0800"
      },
      "message": "Refactor ReflexiveStatsEvent.getSdkVersion into Platform.getTargetSdkVersion\n\nChange-Id: I2ffdc575ad637331b11b19e3ebe54550c9ffd25e\n"
    },
    {
      "commit": "4006c05aec3607ab6490f09031cde5897458cc75",
      "tree": "7988145c4ffa217b38d3951a4c050fc60a347529",
      "parents": [
        "15dbb48c1bb8c645a0406909414385779903590c",
        "285790f177b053656e0bed56887ab382886aee5d"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Mon Feb 17 05:26:56 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Mon Feb 17 05:26:56 2025 -0800"
      },
      "message": "Merge \"Add Spake Credential registration native code.\" into main am: 285790f177\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3477972\n\nChange-Id: Iad1272aebe8cbf9745653b50f8896d0bf2825647\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "285790f177b053656e0bed56887ab382886aee5d",
      "tree": "7988145c4ffa217b38d3951a4c050fc60a347529",
      "parents": [
        "9938536b201d9eaed3761d663600be957d81d2d3",
        "4c7c3cfd8137d3d7233bd85bdbef320eaf229368"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Mon Feb 17 04:57:12 2025 -0800"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Mon Feb 17 04:57:12 2025 -0800"
      },
      "message": "Merge \"Add Spake Credential registration native code.\" into main"
    },
    {
      "commit": "4c7c3cfd8137d3d7233bd85bdbef320eaf229368",
      "tree": "5e016c932d3349374605a744052630db46580ebb",
      "parents": [
        "e0b48c1134c3380bac86eef510535a5a9fdfa853"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Mon Feb 17 02:58:17 2025 -0800"
      },
      "committer": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Mon Feb 17 02:58:17 2025 -0800"
      },
      "message": "Add Spake Credential registration native code.\n\nAdds calls to register spake and add credentials to the ssl_ctx. The 3 different calls are for different parameter inputs, namely:\n- password\n- w0 and w1 (clients)\n- w0 and L (servers)\n\nChange-Id: I39bbf81ef831c66af81239b6a715532da55d2765\nTest: SpakeTest\nBug: 382233100\n"
    },
    {
      "commit": "15dbb48c1bb8c645a0406909414385779903590c",
      "tree": "55f15ff95116acd8f171487228b805b9259822f9",
      "parents": [
        "90e88c85444880bb0e7512806fcd2131b5d19d98",
        "9938536b201d9eaed3761d663600be957d81d2d3"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Thu Feb 13 09:40:08 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Thu Feb 13 09:40:08 2025 -0800"
      },
      "message": "Remove password verifiers as Spake2Plus options. am: 9938536b20\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3494390\n\nChange-Id: Ifd23d6e7a12eefec40fb140cb3825c0c3c160f88\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "9938536b201d9eaed3761d663600be957d81d2d3",
      "tree": "55f15ff95116acd8f171487228b805b9259822f9",
      "parents": [
        "ebe9322c379e7e63324a85c54da7922a3d3597c3"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Thu Feb 13 08:01:38 2025 -0800"
      },
      "committer": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Thu Feb 13 08:01:38 2025 -0800"
      },
      "message": "Remove password verifiers as Spake2Plus options.\n\nFrom the discussion within aosp/3477972 it seems we only need to support the password case for the time being, so this disallows passing password verifier values into conscrypt.\n\nAlso ensures that if null values are passed in for context, or client/server verifiers, these will later be transformed to empty arrays\n\nChange-Id: I57ac9cc028a9c0f3ce7ce20ad3f514ccaf417265\nTest: atest PakeOptionTest/PakeClient/ServerKeyManagerParametersTest/SpakeTest\nBug: 382233100\n"
    },
    {
      "commit": "90e88c85444880bb0e7512806fcd2131b5d19d98",
      "tree": "8763b06cce5c5f30427e4d72fa00762c0f5b429c",
      "parents": [
        "5981c524e64b43941788a6dd1850043ddc3ffdb4",
        "ebe9322c379e7e63324a85c54da7922a3d3597c3"
      ],
      "author": {
        "name": "Thiébaud Weksteen",
        "email": "tweek@google.com",
        "time": "Wed Feb 12 14:23:12 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Wed Feb 12 14:23:12 2025 -0800"
      },
      "message": "Add periodic reloading for CT log list am: ebe9322c37\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3464522\n\nChange-Id: I7aa298b58db6d50195b0e53daa316faae59b716a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "ebe9322c379e7e63324a85c54da7922a3d3597c3",
      "tree": "8763b06cce5c5f30427e4d72fa00762c0f5b429c",
      "parents": [
        "2a58cdb5383a9f9a6b86d28c480fba2fd96a6378"
      ],
      "author": {
        "name": "Thiébaud Weksteen",
        "email": "tweek@google.com",
        "time": "Wed Jan 15 12:56:39 2025 +1100"
      },
      "committer": {
        "name": "Thiébaud Weksteen",
        "email": "tweek@google.com",
        "time": "Wed Feb 12 14:23:40 2025 +1100"
      },
      "message": "Add periodic reloading for CT log list\n\nAttempt to reload the log list when it is detected that a change might\nhave occurred. The detection logic is run every 10 minutes. This ensures\nlog list updates will be picked up relatively quickly (e.g., if the\ndevice recently booted and did not have time to download the log list;\nor if the kill switch removed the log list).\n\nBug: 354583924\nTest: atest ConscryptPrivateTestCases\nTest: atest CtsNetSecConfigCertificateTransparencyTestCases\nTest: atest NetSecConfigCertificateTransparencySctLogListTestCases\nTest: atest NetSecConfigCertificateTransparencySctNoLogListTestCases\nChange-Id: Iea62e1515cfcc81c9f9e6eb16f9def0883fd5af5\n"
    },
    {
      "commit": "5981c524e64b43941788a6dd1850043ddc3ffdb4",
      "tree": "5266fef995e319d7e8e70296179db0a096fe7a81",
      "parents": [
        "dc66e3754e3b7d39a511a96bb1494907a5f8cad2",
        "2a58cdb5383a9f9a6b86d28c480fba2fd96a6378"
      ],
      "author": {
        "name": "Thiébaud Weksteen",
        "email": "tweek@google.com",
        "time": "Tue Feb 11 14:46:36 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Tue Feb 11 14:46:36 2025 -0800"
      },
      "message": "Merge \"Update test names\" into main am: 2a58cdb538\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3481690\n\nChange-Id: I3c2e07c8398f89e0ac6904aecec0aa91187e5e70\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "2a58cdb5383a9f9a6b86d28c480fba2fd96a6378",
      "tree": "5266fef995e319d7e8e70296179db0a096fe7a81",
      "parents": [
        "823fb17a71325793c8cbb8ddfb2e6dc411a3e926",
        "ae59b42cdd11de28714bc4aaf6b40c2d6f0e36be"
      ],
      "author": {
        "name": "Thiébaud Weksteen",
        "email": "tweek@google.com",
        "time": "Tue Feb 11 14:10:38 2025 -0800"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Tue Feb 11 14:10:38 2025 -0800"
      },
      "message": "Merge \"Update test names\" into main"
    },
    {
      "commit": "dc66e3754e3b7d39a511a96bb1494907a5f8cad2",
      "tree": "923b7382cf854674b1540c391ae6a8d9b23db8cd",
      "parents": [
        "1c96f813e310ee19e920bcb65ec1b1b763658dab",
        "823fb17a71325793c8cbb8ddfb2e6dc411a3e926"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Tue Feb 11 08:13:00 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Tue Feb 11 08:13:00 2025 -0800"
      },
      "message": "Merge \"Make sure default protocol list is initlialised based on deprecation/support status.\" into main am: 823fb17a71\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3430868\n\nChange-Id: I1662f264afa5ccacb285b6e0d2d7e0af893ffad6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "823fb17a71325793c8cbb8ddfb2e6dc411a3e926",
      "tree": "923b7382cf854674b1540c391ae6a8d9b23db8cd",
      "parents": [
        "ec1bcb2cd709739b30be3f954705f6437c046106",
        "65c482bd0e16a8cc01ec0755566e126ab4766a99"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Tue Feb 11 07:45:06 2025 -0800"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Tue Feb 11 07:45:06 2025 -0800"
      },
      "message": "Merge \"Make sure default protocol list is initlialised based on deprecation/support status.\" into main"
    },
    {
      "commit": "65c482bd0e16a8cc01ec0755566e126ab4766a99",
      "tree": "e1477809af2e2eaf8174bcff77c8b40c65d9e020",
      "parents": [
        "cfc10fd8d42e82498a08ad9ed4cc656f5282a6e3"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Mon Feb 10 10:11:46 2025 -0800"
      },
      "committer": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Mon Feb 10 10:12:37 2025 -0800"
      },
      "message": "Make sure default protocol list is initlialised based on deprecation/support status.\n\nChange-Id: Ic4bbe5f75cfb3ee343dea3a7c75831cff8be382b\nTest: atest NativeCryptoTest\nBug: 369812580\n"
    },
    {
      "commit": "1c96f813e310ee19e920bcb65ec1b1b763658dab",
      "tree": "470a19f6a61ad566bc466261344d108b8e83320b",
      "parents": [
        "173501a2ee843f35865fc1d9975bdf0c128b7ac5",
        "ec1bcb2cd709739b30be3f954705f6437c046106"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Mon Feb 10 08:10:41 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Mon Feb 10 08:10:41 2025 -0800"
      },
      "message": "Merge \"Update Android CA Certificates (external/conscrypt)\" into main am: ec1bcb2cd7\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3474494\n\nChange-Id: Ia9f8bb045406f2ba17e49d49d1da337a99130e82\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "ec1bcb2cd709739b30be3f954705f6437c046106",
      "tree": "470a19f6a61ad566bc466261344d108b8e83320b",
      "parents": [
        "e0b48c1134c3380bac86eef510535a5a9fdfa853",
        "ac344ea45813bf9669084e1c2b1ff4f6a3e7db71"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Mon Feb 10 07:45:40 2025 -0800"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Mon Feb 10 07:45:40 2025 -0800"
      },
      "message": "Merge \"Update Android CA Certificates (external/conscrypt)\" into main"
    },
    {
      "commit": "173501a2ee843f35865fc1d9975bdf0c128b7ac5",
      "tree": "3a1a4dc778c59a45b5699dcf268751ff0cb76589",
      "parents": [
        "b5e5e6f300adb8581160dea0dd76d87c43292315",
        "e0b48c1134c3380bac86eef510535a5a9fdfa853"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Mon Feb 10 02:45:05 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Mon Feb 10 02:45:05 2025 -0800"
      },
      "message": "Add SSL_CREDENTIAL native methods. am: e0b48c1134\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3477271\n\nChange-Id: I611c3321f849ea15a1154095e3d91420dea3e56c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "00e8fa42f8ba0f8de7a5ea3b1fcda0fc0e236fe4",
      "tree": "84b5381399d2cab0aee7d76f41e84cc20f3cf9ce",
      "parents": [
        "fc409e28503b5de3fa26af91b70f9290f42db206"
      ],
      "author": {
        "name": "Pete Bentley",
        "email": "prb@google.com",
        "time": "Tue Jul 11 18:07:32 2023 +0100"
      },
      "committer": {
        "name": "Pete Bentley",
        "email": "prb@google.com",
        "time": "Mon Feb 10 02:41:29 2025 -0800"
      },
      "message": "Update test certs for CertBlocklistTest\n\nCherry-pick Note:  No functional change on older releases or branches,\nbut this change handles the case if a modern BoringSSL is present\n(e.g. via the Conscrypt module) which will reject these certs.\n\nHOWEVER this is a modified version of https://r.android.com/2653920 to\nhandle the fact that filenames were changed between Android 11 and 12\nfor inclusive language reasons.  \nMerged from upstream PR #1108\n\nPrevious certs had invalid date fields and no instructions for how to\nrecreate.\n\nBug: 286993265\nBug: 388639293\nBug: 395006017\nTest: atest CtsLibcoreTestCases:com.android.org.conscrypt.CertBlocklistTest\n(cherry picked from commit a49419c4b990c3bccf0589720bb6af6f531e837b)\n(cherry picked from https://android-review.googlesource.com/q/commit:5864a51aa3ddad61526f7ed038f1610a42b725b4)\nMerged-In: I8ef9a63d5562e45f26b6b5379234c228e1eaa196\nChange-Id: I8ef9a63d5562e45f26b6b5379234c228e1eaa196\n(cherry picked from commit 5086938fd9f1393a8b47a709d7bf1ca09fd6aee5)\n"
    },
    {
      "commit": "ae59b42cdd11de28714bc4aaf6b40c2d6f0e36be",
      "tree": "624c55d7ae420434bb622a917677a6c5a2271d15",
      "parents": [
        "25835dbda0e2cf3b7eefcfeeb22399ed4ff88c94"
      ],
      "author": {
        "name": "Thiébaud Weksteen",
        "email": "tweek@google.com",
        "time": "Fri Feb 07 11:31:43 2025 +1100"
      },
      "committer": {
        "name": "Thiébaud Weksteen",
        "email": "tweek@google.com",
        "time": "Fri Feb 07 11:44:50 2025 +1100"
      },
      "message": "Update test names\n\nFollow up from feedback on commit f08c1dffe041ad8ed2e55ca07f42cfa5fd4d6919.\n\nTest: presubmit\nChange-Id: I921e3844fe0cfb4dbcf93644cb450f41aa0df49d\n"
    },
    {
      "commit": "e0b48c1134c3380bac86eef510535a5a9fdfa853",
      "tree": "3a1a4dc778c59a45b5699dcf268751ff0cb76589",
      "parents": [
        "25835dbda0e2cf3b7eefcfeeb22399ed4ff88c94"
      ],
      "author": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Feb 05 06:45:24 2025 -0800"
      },
      "committer": {
        "name": "Miguel Aranda",
        "email": "miguelaranda@google.com",
        "time": "Wed Feb 05 08:28:31 2025 -0800"
      },
      "message": "Add SSL_CREDENTIAL native methods.\n\nChange-Id: I072d6765291e4642265a1ef07c992f55c0ea9fa0\nBug: 382233100\n"
    },
    {
      "commit": "ac344ea45813bf9669084e1c2b1ff4f6a3e7db71",
      "tree": "050f241030ffa1c5a398dd07d7dd39a00736003c",
      "parents": [
        "25835dbda0e2cf3b7eefcfeeb22399ed4ff88c94"
      ],
      "author": {
        "name": "Miguel",
        "email": "miguelaranda@google.com",
        "time": "Tue Feb 04 02:12:19 2025 -0800"
      },
      "committer": {
        "name": "Android Build Cherrypicker Worker",
        "email": "android-build-cherrypicker-worker@google.com",
        "time": "Tue Feb 04 02:12:19 2025 -0800"
      },
      "message": "Update Android CA Certificates (external/conscrypt)\n\nTest: atest CertificateTest\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ebf1b9b005d0d94c79fe59ef21dc7bf08a1b796a)\nMerged-In: I152ac6cd5ae9c65762f4bde50333ef1f5deaa073\nChange-Id: I152ac6cd5ae9c65762f4bde50333ef1f5deaa073\n"
    },
    {
      "commit": "b5e5e6f300adb8581160dea0dd76d87c43292315",
      "tree": "0e8e219dab8fa91ff09035585b548bdfd1998be8",
      "parents": [
        "22f8885fc6900758793d5b972eaee7a04a90e3a6",
        "25835dbda0e2cf3b7eefcfeeb22399ed4ff88c94"
      ],
      "author": {
        "name": "Paul Duffin",
        "email": "paulduffin@google.com",
        "time": "Sat Jan 25 03:33:26 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Sat Jan 25 03:33:26 2025 -0800"
      },
      "message": "Override api_surface for intra core and core platform am: 25835dbda0\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3463282\n\nChange-Id: I585bdc7824712f007a9fdb2e47995e3c66debe17\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "25835dbda0e2cf3b7eefcfeeb22399ed4ff88c94",
      "tree": "0e8e219dab8fa91ff09035585b548bdfd1998be8",
      "parents": [
        "f08c1dffe041ad8ed2e55ca07f42cfa5fd4d6919"
      ],
      "author": {
        "name": "Paul Duffin",
        "email": "paulduffin@google.com",
        "time": "Fri Jan 24 18:47:21 2025 +0000"
      },
      "committer": {
        "name": "Paul Duffin",
        "email": "paulduffin@google.com",
        "time": "Fri Jan 24 22:31:02 2025 +0000"
      },
      "message": "Override api_surface for intra core and core platform\n\nPreparation for changes that add configuration for the API surfaces in\n`build/soong/java/metalava/main-config.xml` and pass Metalava the name\nof the surface instead of `--show-single-annotation` command line\noptions. That will avoid duplicating the command line arguments for\neach API surface in multiple locations.\n\nWhile most `java_sdk_library` modules use the correct `api_surface`\nthat is not true for the `intra-core` and `core-platform` APIs so this\nchange overrides the default `api_surface` for those.\n\nBug: 391554590\nTest: m checkapi\nChange-Id: Ib5568face5118bbd1bdd7e27ce99a7eec2b054bf\n"
    },
    {
      "commit": "22f8885fc6900758793d5b972eaee7a04a90e3a6",
      "tree": "88aa792c90a327a673b9200b5bac78de47980eb5",
      "parents": [
        "56854647a5e34b0d4cf22187691db602eed8b539",
        "f08c1dffe041ad8ed2e55ca07f42cfa5fd4d6919"
      ],
      "author": {
        "name": "Thiébaud Weksteen",
        "email": "tweek@google.com",
        "time": "Fri Jan 24 05:50:11 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Fri Jan 24 05:50:11 2025 -0800"
      },
      "message": "Reword LogStoreImplTest test names am: f08c1dffe0\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3464521\n\nChange-Id: Ie3d8e0db6d2fba335d170c40c1f4b0fa72ceca8e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "56854647a5e34b0d4cf22187691db602eed8b539",
      "tree": "33e18c5ecdae185155a36f8703142a3adf5c941d",
      "parents": [
        "80244a3cede6e754e3ad6e752953294ac242a9be",
        "0eca9bd331ba6624e22a876b6e29b53d4a4d4c9f"
      ],
      "author": {
        "name": "Thiébaud Weksteen",
        "email": "tweek@google.com",
        "time": "Fri Jan 24 05:50:01 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Fri Jan 24 05:50:01 2025 -0800"
      },
      "message": "Fix assertEquals arguments order am: 0eca9bd331\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3464520\n\nChange-Id: Ied5059ef14794aea30b7e7b590a85b8688fcd48a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "80244a3cede6e754e3ad6e752953294ac242a9be",
      "tree": "d65c80bb9e0af7e63fcc6b1df3a36e7c2c323e38",
      "parents": [
        "2b0c6f51948a7556174ddf8ecb0ec42df0216c1e",
        "3863d9409bcd2d1c5ae716cd3f9b016c332273ad"
      ],
      "author": {
        "name": "Thiébaud Weksteen",
        "email": "tweek@google.com",
        "time": "Fri Jan 24 05:49:57 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Fri Jan 24 05:49:57 2025 -0800"
      },
      "message": "Use Path in LogStoreImplTest am: 3863d9409b\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3464519\n\nChange-Id: I4070f5f8abfc8e7b9a46b9252c15b78021385c85\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "2b0c6f51948a7556174ddf8ecb0ec42df0216c1e",
      "tree": "475ae156a47433b15931831712900b26fdeafe13",
      "parents": [
        "195315721faf7bd2663d593c526bafac582cfd91",
        "a2535519f8fd3bf17e3e319498c4e75d03d2a250"
      ],
      "author": {
        "name": "Thiébaud Weksteen",
        "email": "tweek@google.com",
        "time": "Fri Jan 24 05:49:47 2025 -0800"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Fri Jan 24 05:49:47 2025 -0800"
      },
      "message": "Regenerate repackaged directory am: a2535519f8\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3463780\n\nChange-Id: I5789513340bcb55d50d5c348c67287c1b792bd3f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "f08c1dffe041ad8ed2e55ca07f42cfa5fd4d6919",
      "tree": "88aa792c90a327a673b9200b5bac78de47980eb5",
      "parents": [
        "0eca9bd331ba6624e22a876b6e29b53d4a4d4c9f"
      ],
      "author": {
        "name": "Thiébaud Weksteen",
        "email": "tweek@google.com",
        "time": "Fri Jan 24 10:38:31 2025 +1100"
      },
      "committer": {
        "name": "Thiébaud Weksteen",
        "email": "tweek@google.com",
        "time": "Fri Jan 24 05:39:26 2025 -0800"
      },
      "message": "Reword LogStoreImplTest test names\n\nBug: 354583924\nTest: atest ConscryptPrivateTestCases\nChange-Id: Ib0222eeedb9033e303507c7ea8b650d38eb9c398\n"
    },
    {
      "commit": "0eca9bd331ba6624e22a876b6e29b53d4a4d4c9f",
      "tree": "33e18c5ecdae185155a36f8703142a3adf5c941d",
      "parents": [
        "3863d9409bcd2d1c5ae716cd3f9b016c332273ad"
      ],
      "author": {
        "name": "Thiébaud Weksteen",
        "email": "tweek@google.com",
        "time": "Thu Jan 23 11:10:56 2025 +1100"
      },
      "committer": {
        "name": "Thiébaud Weksteen",
        "email": "tweek@google.com",
        "time": "Fri Jan 24 05:39:26 2025 -0800"
      },
      "message": "Fix assertEquals arguments order\n\nThe expected value comes first.\n\nBug: 354583924\nTest: atest ConscryptPrivateTestCases\nChange-Id: Iddb16d65381a619154bb4bf29c597511fa01a2cc\n"
    },
    {
      "commit": "3863d9409bcd2d1c5ae716cd3f9b016c332273ad",
      "tree": "d65c80bb9e0af7e63fcc6b1df3a36e7c2c323e38",
      "parents": [
        "a2535519f8fd3bf17e3e319498c4e75d03d2a250"
      ],
      "author": {
        "name": "Thiébaud Weksteen",
        "email": "tweek@google.com",
        "time": "Wed Jan 22 12:58:45 2025 +1100"
      },
      "committer": {
        "name": "Thiébaud Weksteen",
        "email": "tweek@google.com",
        "time": "Fri Jan 24 05:39:26 2025 -0800"
      },
      "message": "Use Path in LogStoreImplTest\n\nSimplifies the tests as the tested class (LogStoreImpl) uses Path\ninstead of File.\n\nBug: 354583924\nTest: atest ConscryptPrivateTestCases\nChange-Id: I779f4bc6def5ad7a260f3fed4f9ef96374cc632b\n"
    },
    {
      "commit": "a2535519f8fd3bf17e3e319498c4e75d03d2a250",
      "tree": "475ae156a47433b15931831712900b26fdeafe13",
      "parents": [
        "a0478ac85db7498f5a4ce7b0ae1e0a3cea825829"
      ],
      "author": {
        "name": "Thiébaud Weksteen",
        "email": "tweek@google.com",
        "time": "Fri Jan 24 14:56:38 2025 +1100"
      },
      "committer": {
        "name": "Thiébaud Weksteen",
        "email": "tweek@google.com",
        "time": "Fri Jan 24 05:37:21 2025 -0800"
      },
      "message": "Regenerate repackaged directory\n\nTest: presubmit\nChange-Id: Ia22e98d22e37d4c70d3cf6ceb079c10e109da78c\n"
    }
  ],
  "next": "195315721faf7bd2663d593c526bafac582cfd91"
}