)]}' { "log": [ { "commit": "2255215bda1a50b312bd1653db1e02d2a8ea1f6c", "tree": "ebd2f239c2ef6ac64c0eb5beb9561729e302f5ba", "parents": [ "eb9f6a41838277a7f8047c7c9e78e3609545be34", "9223a96261742eadbc443dc6511900d0377c63b4" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Mar 10 09:56:06 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Mar 10 09:56:06 2025 -0700" }, "message": "Merge \"Merge 25Q1 (ab/BP1A.250305.020) to AOSP main\" into main" }, { "commit": "9223a96261742eadbc443dc6511900d0377c63b4", "tree": "ebd2f239c2ef6ac64c0eb5beb9561729e302f5ba", "parents": [ "eb9f6a41838277a7f8047c7c9e78e3609545be34", "f4129f19e2947ab695326019962f3157538f5c76" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Mar 08 16:09:54 2025 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Mar 08 16:09:54 2025 -0800" }, "message": "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main\n\nBug: 385190204\nMerged-In: I481e64987fbdb610209213eaaa415738299197eb\nChange-Id: I90d16869d2fe29508946751134d1a9a2b9d8dcbf\n" }, { "commit": "f4129f19e2947ab695326019962f3157538f5c76", "tree": "ebd2f239c2ef6ac64c0eb5beb9561729e302f5ba", "parents": [ "63c2c7f51b1edbce8ac2c37b4635521c969dfae9", "4d975eceaed36b171b39f346c2731766f5bd86ff" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Feb 26 11:58:43 2025 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Feb 26 11:58:43 2025 -0800" }, "message": "Merge 25Q1 (ab/12770256) to aosp-main-future\n\nBug: 385190204\nMerged-In: Ifb162ad71e7dcef139edbdb6edb6f6347b1ed93a\nChange-Id: I8efc561ec3a50f5cd07c2f557cc5ca4485751c03\n" }, { "commit": "63c2c7f51b1edbce8ac2c37b4635521c969dfae9", "tree": "b1ad727683f104476d4d00d2bb76fc4fcce08148", "parents": [ "4e790dbd1bf3e8ee28c6c5c52aeac6a727d65c63", "eb9f6a41838277a7f8047c7c9e78e3609545be34" ], "author": { "name": "Owner Cleanup Bot", "email": "swarming-tasks@owners-cleanup-prod.google.com.iam.gserviceaccount.com", "time": "Tue Feb 25 15:38:37 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 25 15:38:37 2025 -0800" }, "message": "Merge \"[owners] Remove jdanis@google.com from OWNERS\" into main am: eb9f6a4183\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/3505151\n\nChange-Id: Ie2bcf4bb6b1211135c0d2dd464340f4395a5b71e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "eb9f6a41838277a7f8047c7c9e78e3609545be34", "tree": "b1ad727683f104476d4d00d2bb76fc4fcce08148", "parents": [ "846d30379468682659ad202c1e332eb0cafbfcdd", "4b0e499bfd0e79d816660f3037848e94160a126a" ], "author": { "name": "Owner Cleanup Bot", "email": "swarming-tasks@owners-cleanup-prod.google.com.iam.gserviceaccount.com", "time": "Tue Feb 25 14:52:32 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Feb 25 14:52:32 2025 -0800" }, "message": "Merge \"[owners] Remove jdanis@google.com from OWNERS\" into main" }, { "commit": "4b0e499bfd0e79d816660f3037848e94160a126a", "tree": "b1ad727683f104476d4d00d2bb76fc4fcce08148", "parents": [ "846d30379468682659ad202c1e332eb0cafbfcdd" ], "author": { "name": "Owner Cleanup Bot", "email": "swarming-tasks@owners-cleanup-prod.google.com.iam.gserviceaccount.com", "time": "Sun Feb 23 08:54:33 2025 -0800" }, "committer": { "name": "Owner Cleanup Bot", "email": "swarming-tasks@owners-cleanup-prod.google.com.iam.gserviceaccount.com", "time": "Sun Feb 23 08:54:38 2025 -0800" }, "message": "[owners] Remove jdanis@google.com from OWNERS\n\nThis suggested change is automatically generated based on group\nmemberships and affiliations.\n\nPlease approve this change and vote the highest CR. This will keep the OWNERs\nfile tidy. We ask that you do not ignore this change and approve it\nunless you know a reason the OWNER should remain. It can always be\nreverted if needed.\n\nIf this change is in error, vote the lowest CR value (i.e. reject the CL)\nand the bot will abandon it.\n\nSee the owner\u0027s recent review activity for context:\nhttps://android-review.googlesource.com/q/jdanis@google.com\n\nTo report an issue, file a bug in the Infra\u003eCodereview component.\n\nChange-Id: I185b35d40c87e95547de12fb3db6040cec100138\n" }, { "commit": "4e790dbd1bf3e8ee28c6c5c52aeac6a727d65c63", "tree": "4cdb72c2a3e4c4afbb520b4428e0b241e3165333", "parents": [ "eaddbbc63a1cf9346665d44bb5a6d33441bb8d05", "846d30379468682659ad202c1e332eb0cafbfcdd" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Jan 15 09:44:52 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 15 09:44:52 2025 -0800" }, "message": "Merge \"Retire rgl@ from Keychain OWNERS\" into main am: 846d303794\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/3451860\n\nChange-Id: Ice674045536824f4dc8d699fb59b33c8eb58e883\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "846d30379468682659ad202c1e332eb0cafbfcdd", "tree": "4cdb72c2a3e4c4afbb520b4428e0b241e3165333", "parents": [ "c169be3320f3cb0e33f5580f0245724fb0bc93c4", "3b05181ce401badba0214eb648f06426731bc35c" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Jan 15 09:14:35 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jan 15 09:14:35 2025 -0800" }, "message": "Merge \"Retire rgl@ from Keychain OWNERS\" into main" }, { "commit": "3b05181ce401badba0214eb648f06426731bc35c", "tree": "4cdb72c2a3e4c4afbb520b4428e0b241e3165333", "parents": [ "c169be3320f3cb0e33f5580f0245724fb0bc93c4" ], "author": { "name": "Robin Lee", "email": "rgl@google.com", "time": "Wed Jan 15 09:02:35 2025 -0800" }, "committer": { "name": "Robin Lee", "email": "rgl@google.com", "time": "Wed Jan 15 09:04:28 2025 -0800" }, "message": "Retire rgl@ from Keychain OWNERS\n\nrgl@ served 5 years in the android for work team but has since moved to\na large farm far away in another org with lots of fresh green coding\nchallenges and expansive space to run around writing bugs.\n\nBug: # 35451189\nTest: Not able to approve next patch someone sends to me\nFlag: EXEMPT (white flag)\nChange-Id: Ie863c2974e2bf379c87234340f2a382dbaad4359\n" }, { "commit": "eaddbbc63a1cf9346665d44bb5a6d33441bb8d05", "tree": "eea1b8facceaceb9e0e94f2259345ab35770d06d", "parents": [ "8e6fb94c765de4a97e8960c43083ea82b8d6ac2a", "c169be3320f3cb0e33f5580f0245724fb0bc93c4" ], "author": { "name": "Rex Hoffman", "email": "rexhoffman@google.com", "time": "Wed Jan 08 07:32:53 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 08 07:32:53 2025 -0800" }, "message": "Merge \"Removing Dead Flag Test: CI Bug: 386652866\" into main am: c169be3320\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/3430949\n\nChange-Id: I3d9d70ad428aa01755c64ece80d5ff87b93f9565\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c169be3320f3cb0e33f5580f0245724fb0bc93c4", "tree": "eea1b8facceaceb9e0e94f2259345ab35770d06d", "parents": [ "8e6fb94c765de4a97e8960c43083ea82b8d6ac2a", "4507ac9af8e1445ee0ce84fc9568e06cfd9cc25a" ], "author": { "name": "Rex Hoffman", "email": "rexhoffman@google.com", "time": "Wed Jan 08 06:57:59 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jan 08 06:57:59 2025 -0800" }, "message": "Merge \"Removing Dead Flag Test: CI Bug: 386652866\" into main" }, { "commit": "4507ac9af8e1445ee0ce84fc9568e06cfd9cc25a", "tree": "eea1b8facceaceb9e0e94f2259345ab35770d06d", "parents": [ "8e6fb94c765de4a97e8960c43083ea82b8d6ac2a" ], "author": { "name": "Rex Hoffman", "email": "rexhoffman@google.com", "time": "Sun Dec 29 19:45:03 2024 +0000" }, "committer": { "name": "Rex Hoffman", "email": "rexhoffman@google.com", "time": "Tue Jan 07 13:54:35 2025 -0800" }, "message": "Removing Dead Flag\nTest: CI\nBug: 386652866\n\nChange-Id: I2b7be4907013b972724fa33366d2965f1476e137\n" }, { "commit": "4d975eceaed36b171b39f346c2731766f5bd86ff", "tree": "faf5366a861313300af7826bf015a5fa61024542", "parents": [ "22e4de516287f3bb80fc6bcc446d1a495fad0bc7" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Nov 27 13:18:39 2024 -0800" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Nov 27 13:18:39 2024 -0800" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: Ifb162ad71e7dcef139edbdb6edb6f6347b1ed93a\n" }, { "commit": "22e4de516287f3bb80fc6bcc446d1a495fad0bc7", "tree": "2015241c078e1ad72a86f7e627a636b781dfa7cd", "parents": [ "478ba406f0e038089774ab66824e9ef7d052b65b", "8e6fb94c765de4a97e8960c43083ea82b8d6ac2a" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Nov 27 08:12:39 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 27 08:12:39 2024 +0000" }, "message": "[automerger skipped] Merge \"Import translations. DO NOT MERGE ANYWHERE\" into main am: 96ba8017b0 -s ours am: 8e6fb94c76 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/3378350\n\nChange-Id: Ib8212f6f3882da4c5fb964af5b31ebaf34570e76\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "478ba406f0e038089774ab66824e9ef7d052b65b", "tree": "2015241c078e1ad72a86f7e627a636b781dfa7cd", "parents": [ "bdb50911a2784337992ab05241d6c3de15f4fd8d", "91268fba27d173d227f82a031fb1e733fd5947dd" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Nov 27 08:12:34 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 27 08:12:34 2024 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5179f2dc9 -s ours am: 91268fba27 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/3378350\n\nChange-Id: Icbbf5a4dabd11e04cd97234515d55d26f2e87e49\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8e6fb94c765de4a97e8960c43083ea82b8d6ac2a", "tree": "fd3408f202390eb4091dce0787000c30a3dd555c", "parents": [ "91268fba27d173d227f82a031fb1e733fd5947dd", "96ba8017b068b960b4410125ce3dd5790334b192" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Nov 27 07:17:14 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 27 07:17:14 2024 +0000" }, "message": "[automerger skipped] Merge \"Import translations. DO NOT MERGE ANYWHERE\" into main am: 96ba8017b0 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/3378350\n\nChange-Id: I9b7a7884e8f5f63f54f3593d95265e071b0ffada\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "91268fba27d173d227f82a031fb1e733fd5947dd", "tree": "fd3408f202390eb4091dce0787000c30a3dd555c", "parents": [ "826748c196a589b1e5ab447773adc524c76f9945", "f5179f2dc95bc079c5dbc3be38afe005a7ff361b" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Nov 27 07:17:03 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 27 07:17:03 2024 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5179f2dc9 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/3378350\n\nChange-Id: I9c580e4c7df2c506d7caa30d6e5a5d9f048eb473\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bdb50911a2784337992ab05241d6c3de15f4fd8d", "tree": "2015241c078e1ad72a86f7e627a636b781dfa7cd", "parents": [ "e574759a4546f64292dd9914d84e422050182f35", "826748c196a589b1e5ab447773adc524c76f9945" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Nov 26 20:47:11 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 26 20:47:11 2024 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 826748c196 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/30594580\n\nChange-Id: I60aa33aef855501a8c9e59d51266c9af1c84c840\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "96ba8017b068b960b4410125ce3dd5790334b192", "tree": "fd3408f202390eb4091dce0787000c30a3dd555c", "parents": [ "4abb646978e2b3511fee46cecb6a842288d4905b", "f5179f2dc95bc079c5dbc3be38afe005a7ff361b" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Nov 26 18:59:15 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Nov 26 18:59:15 2024 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE ANYWHERE\" into main" }, { "commit": "f5179f2dc95bc079c5dbc3be38afe005a7ff361b", "tree": "fd3408f202390eb4091dce0787000c30a3dd555c", "parents": [ "4abb646978e2b3511fee46cecb6a842288d4905b" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Nov 26 06:59:34 2024 -0800" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Nov 26 06:59:34 2024 -0800" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: I8d8b342c4f88a5301c3ecb8ce337544c579b46d8\n" }, { "commit": "826748c196a589b1e5ab447773adc524c76f9945", "tree": "fd3408f202390eb4091dce0787000c30a3dd555c", "parents": [ "61fef716312842f5c18e1fc1817019a1e0af4b1f" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Nov 26 05:50:25 2024 -0800" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Nov 26 05:50:25 2024 -0800" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: I12f39230f4153f38595cab138fe76cc0fe48d2f4\n" }, { "commit": "e574759a4546f64292dd9914d84e422050182f35", "tree": "2015241c078e1ad72a86f7e627a636b781dfa7cd", "parents": [ "7970d8b8420a3ff9c0a73382975ea49ea8edc110" ], "author": { "name": "Andreea Costinas", "email": "acostinas@google.com", "time": "Thu Nov 07 13:48:08 2024 +0000" }, "committer": { "name": "Andreea Costinas", "email": "acostinas@google.com", "time": "Tue Nov 12 10:55:58 2024 +0000" }, "message": "Allow admin users to install WiFi client certificates\n\nGrants admin users the ability to install WiFi client certificates,\nlaying the groundwork for enabling user-imported WiFi certificates\nin HSUM mode.\n\nBug: b/370013519\nFlag: EXEMPT bugfix\nTest: manually installed and removed client certificate for WiFi\nChange-Id: Ic9d009365e9de400ea285fb55a93509e95a49e06\n" }, { "commit": "7970d8b8420a3ff9c0a73382975ea49ea8edc110", "tree": "b2592aab867a999014babe04ff03d4d7da6f543c", "parents": [ "61fef716312842f5c18e1fc1817019a1e0af4b1f" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Oct 22 17:17:56 2024 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Oct 22 17:17:56 2024 -0700" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: Ic49641ba6c8483fa37b98ed122ef55e74d86d021\n" }, { "commit": "61fef716312842f5c18e1fc1817019a1e0af4b1f", "tree": "168a6df95db132291acf4b8651a30653de76b418", "parents": [ "8739e0aa40623fe9f32fd161b1fd2cd2937ad9ca", "02db29fe5e2a7fb336bbeeddb670093edde7b4bc" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 02:22:17 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 02:22:17 2024 +0000" }, "message": "[automerger skipped] Merge \"Merge 24Q3 to AOSP main\" into main am: 4abb646978 -s ours am: 02db29fe5e -s ours\n\nam skip reason: Merged-In Ifef2359252724143fcf8f57f9f36a09d71e45c2c with SHA-1 732f3ef60c is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/3255684\n\nChange-Id: I1dbbdd188cd28ae83aed7b1a1a78326968438a72\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8739e0aa40623fe9f32fd161b1fd2cd2937ad9ca", "tree": "168a6df95db132291acf4b8651a30653de76b418", "parents": [ "c63510ab7e17a98c6ceaf06293a368eb5e0fb132", "f0109b9382b0283dca269f4605dc3c768bb5319b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 02:22:14 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 02:22:14 2024 +0000" }, "message": "[automerger skipped] Merge 24Q3 to AOSP main am: 53ca477568 -s ours am: f0109b9382 -s ours\n\nam skip reason: Merged-In Ifef2359252724143fcf8f57f9f36a09d71e45c2c with SHA-1 732f3ef60c is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/3255684\n\nChange-Id: I484411fb5304772002228d44f5a7229b40d864e7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "02db29fe5e2a7fb336bbeeddb670093edde7b4bc", "tree": "168a6df95db132291acf4b8651a30653de76b418", "parents": [ "f0109b9382b0283dca269f4605dc3c768bb5319b", "4abb646978e2b3511fee46cecb6a842288d4905b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 01:42:38 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 01:42:38 2024 +0000" }, "message": "[automerger skipped] Merge \"Merge 24Q3 to AOSP main\" into main am: 4abb646978 -s ours\n\nam skip reason: Merged-In Ifef2359252724143fcf8f57f9f36a09d71e45c2c with SHA-1 732f3ef60c is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/3255684\n\nChange-Id: I58e7dcd2b8251eb2aa727032c28785ffed592a60\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f0109b9382b0283dca269f4605dc3c768bb5319b", "tree": "168a6df95db132291acf4b8651a30653de76b418", "parents": [ "0df42533a12e8e18baed7f8bb5e5b9c098a1c058", "53ca4775684874f12eb693f4691d5dbba7100f8e" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 01:42:34 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 01:42:34 2024 +0000" }, "message": "[automerger skipped] Merge 24Q3 to AOSP main am: 53ca477568 -s ours\n\nam skip reason: Merged-In Ifef2359252724143fcf8f57f9f36a09d71e45c2c with SHA-1 732f3ef60c is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/3255684\n\nChange-Id: I89dd10d5731d05448e000379d1e9deb92fba9d6b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4abb646978e2b3511fee46cecb6a842288d4905b", "tree": "168a6df95db132291acf4b8651a30653de76b418", "parents": [ "aaa15def88c96e1229d4f9b8a98ccceeecf7fad9", "53ca4775684874f12eb693f4691d5dbba7100f8e" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 01:13:14 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Sat Sep 07 01:13:14 2024 +0000" }, "message": "Merge \"Merge 24Q3 to AOSP main\" into main" }, { "commit": "53ca4775684874f12eb693f4691d5dbba7100f8e", "tree": "168a6df95db132291acf4b8651a30653de76b418", "parents": [ "aaa15def88c96e1229d4f9b8a98ccceeecf7fad9", "0df42533a12e8e18baed7f8bb5e5b9c098a1c058" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Sep 05 17:02:56 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Sep 05 17:02:56 2024 -0700" }, "message": "Merge 24Q3 to AOSP main\n\nBug: 357762254\nMerged-In: Ifef2359252724143fcf8f57f9f36a09d71e45c2c\nChange-Id: Iba92352cb7808bb4a6bba584c01dd7abf794abf0\n" }, { "commit": "c63510ab7e17a98c6ceaf06293a368eb5e0fb132", "tree": "168a6df95db132291acf4b8651a30653de76b418", "parents": [ "c642b7b53a0da3c8941c345abd75752eea0e5ccf", "0df42533a12e8e18baed7f8bb5e5b9c098a1c058" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Aug 30 18:51:03 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 30 18:51:03 2024 +0000" }, "message": "Merge \"Make java_sdk_library dependencies explicit\" into main am: aaa15def88 am: 0df42533a1\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/3247518\n\nChange-Id: I18f3992155a5d8c7db78be5b964b3d265aeaf6b2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0df42533a12e8e18baed7f8bb5e5b9c098a1c058", "tree": "168a6df95db132291acf4b8651a30653de76b418", "parents": [ "ecfbfc9e49bd41d0f9b06f12a6c6318dcd751c66", "aaa15def88c96e1229d4f9b8a98ccceeecf7fad9" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Aug 30 18:30:21 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 30 18:30:21 2024 +0000" }, "message": "Merge \"Make java_sdk_library dependencies explicit\" into main am: aaa15def88\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/3247518\n\nChange-Id: Ibe92bb035b77c028524fe1b53d086662ac0b056c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "aaa15def88c96e1229d4f9b8a98ccceeecf7fad9", "tree": "5cc944a8e437ece357b93bcd752bd68027ad0ea1", "parents": [ "322c1d2c5b16712eff7b9ebd5c50c89c455bb72d", "eae967f54a88094abe1e188981979b5f2a58a53b" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Aug 30 18:07:11 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Aug 30 18:07:11 2024 +0000" }, "message": "Merge \"Make java_sdk_library dependencies explicit\" into main" }, { "commit": "eae967f54a88094abe1e188981979b5f2a58a53b", "tree": "5cc944a8e437ece357b93bcd752bd68027ad0ea1", "parents": [ "322c1d2c5b16712eff7b9ebd5c50c89c455bb72d" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Aug 30 00:29:40 2024 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Aug 30 00:29:40 2024 +0000" }, "message": "Make java_sdk_library dependencies explicit\n\nmodules should specify the submodule of java_sdk_library that the module\nactually depends on\n\nTest: CI\nBug: 358613520\nChange-Id: I9f41fa2de25c3cbef6552f15d082917106907a3d\n" }, { "commit": "c642b7b53a0da3c8941c345abd75752eea0e5ccf", "tree": "cf5a9ba1408142d6e2232325fe31e3c65b8a4953", "parents": [ "ef3c08e45ba76ca523ac5220a10298c8e6008143", "ecfbfc9e49bd41d0f9b06f12a6c6318dcd751c66" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Aug 08 19:49:52 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 08 19:49:52 2024 +0000" }, "message": "Mark AP3A.240905.001 as merged in aosp-main-future am: ecfbfc9e49\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/28708885\n\nChange-Id: I76dd1189849ab948536f6a10936d87113c5eff38\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ecfbfc9e49bd41d0f9b06f12a6c6318dcd751c66", "tree": "cf5a9ba1408142d6e2232325fe31e3c65b8a4953", "parents": [ "732f3ef60cae4450d6e1a39db93c58566559119c", "b61f28c0a4a856ba557d0b05235957a15144ade0" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Aug 08 10:37:59 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Aug 08 10:37:59 2024 -0700" }, "message": "Mark AP3A.240905.001 as merged in aosp-main-future\n\nBug: 347831320\nMerged-In: I4754b2b48702fbae32946f68b97175e1209749b5\nChange-Id: I91d4a8899e848aaa3c0dafc6f9edf6f2dbb38426\n" }, { "commit": "ef3c08e45ba76ca523ac5220a10298c8e6008143", "tree": "cf5a9ba1408142d6e2232325fe31e3c65b8a4953", "parents": [ "ed2031c9ea8d26f12d0a474c40e38dc3134b75ab", "732f3ef60cae4450d6e1a39db93c58566559119c" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Aug 07 06:57:05 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 07 06:57:05 2024 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 732f3ef60c -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/28664152\n\nChange-Id: I5dded4831a99145162d935109e32be7ca72c9731\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "732f3ef60cae4450d6e1a39db93c58566559119c", "tree": "cf5a9ba1408142d6e2232325fe31e3c65b8a4953", "parents": [ "2448a586d291f54ad8c735f969297df7c177736b" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Aug 06 17:07:09 2024 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Aug 06 17:07:09 2024 -0700" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: Ifef2359252724143fcf8f57f9f36a09d71e45c2c\n" }, { "commit": "ed2031c9ea8d26f12d0a474c40e38dc3134b75ab", "tree": "cf5a9ba1408142d6e2232325fe31e3c65b8a4953", "parents": [ "e618a8cbf8af9fbb3f7f38ee9132cbaa6fa9fb5a", "e1ea24499628f886596873a03b4ed0de303a430d" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Jul 24 05:15:14 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jul 24 05:15:14 2024 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE ANYWHERE\" into main" }, { "commit": "e618a8cbf8af9fbb3f7f38ee9132cbaa6fa9fb5a", "tree": "878739be9ffd07e7dc58c3601b9da486e354ff88", "parents": [ "53f9aae66d89b0d225932de0b7153c0988da229e", "5cbb7fd8d512ed02c42c0ab366cb762f47e3bd2c" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Jul 23 09:10:23 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jul 23 09:10:23 2024 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cbb7fd8d5 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/28441282\n\nChange-Id: I10097e9f8697d974362dfd5825d65f3b642a38b7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5cbb7fd8d512ed02c42c0ab366cb762f47e3bd2c", "tree": "8b08004dd1fd7c9bea2a5a92a01bf8ab6d00c071", "parents": [ "804032d34df7b592d7dff4a7f060c873f31b28c3" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Mon Jul 22 21:13:45 2024 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Mon Jul 22 21:13:45 2024 -0700" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: Ibc6131750d7e536954088e356f934cda9bda17cf\n" }, { "commit": "e1ea24499628f886596873a03b4ed0de303a430d", "tree": "cf5a9ba1408142d6e2232325fe31e3c65b8a4953", "parents": [ "53f9aae66d89b0d225932de0b7153c0988da229e" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Mon Jul 22 21:13:02 2024 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Mon Jul 22 21:13:02 2024 -0700" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: Ieef4cae72e46033a213915f75e356ed0f7a85877\n" }, { "commit": "b61f28c0a4a856ba557d0b05235957a15144ade0", "tree": "878739be9ffd07e7dc58c3601b9da486e354ff88", "parents": [ "dfe983004b776f1949ae96562e17b44dac146fa0", "f147a2486775b2c1d81dd73e4c0a67010b1ba4b9" ], "author": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Fri Jul 12 04:04:07 2024 +0000" }, "committer": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Fri Jul 12 04:04:07 2024 +0000" }, "message": "Merge cherrypicks of [\u0027googleplex-android-review.googlesource.com/28239385\u0027] into 24Q3-release.\n\nChange-Id: Ie0f7b6662f7a7941e42e650e1ea36a4c8cd6db57\n" }, { "commit": "f147a2486775b2c1d81dd73e4c0a67010b1ba4b9", "tree": "878739be9ffd07e7dc58c3601b9da486e354ff88", "parents": [ "dfe983004b776f1949ae96562e17b44dac146fa0" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Jul 09 15:33:35 2024 -0700" }, "committer": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Fri Jul 12 03:52:22 2024 +0000" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\n\nBug: 347053373\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:985071ffa5d177c742f6e8ebf8c45abbe9d816f3)\nMerged-In: I4754b2b48702fbae32946f68b97175e1209749b5\nChange-Id: I4754b2b48702fbae32946f68b97175e1209749b5\n" }, { "commit": "53f9aae66d89b0d225932de0b7153c0988da229e", "tree": "878739be9ffd07e7dc58c3601b9da486e354ff88", "parents": [ "0371916abc5607ef2e4804b32ac2277251c6e2c4", "fb20581165ca615c678527989a047fa0c427828f" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Jul 09 22:10:15 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jul 09 22:10:15 2024 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE ANYWHERE\" into main" }, { "commit": "0371916abc5607ef2e4804b32ac2277251c6e2c4", "tree": "c9210f1d624a4970165223064bf51f7ac7865ede", "parents": [ "72f4634d3901506a2ddb271c123bf5d39b4dee89", "804032d34df7b592d7dff4a7f060c873f31b28c3" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Jul 09 20:08:44 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jul 09 20:08:44 2024 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 804032d34d -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/28209955\n\nChange-Id: If10d3b54d659dbffc4e45317082bb24804f2ae11\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "804032d34df7b592d7dff4a7f060c873f31b28c3", "tree": "32615906174ab0f578a8073ea55891e02bca57ab", "parents": [ "b39547aa30a13f791fe41b9451c7aa80c48ae42a" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 07 22:43:11 2024 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 07 22:43:11 2024 -0700" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: I413d30c34dd1e2d9a7adbf4a1c04f472dca3cd8f\n" }, { "commit": "fb20581165ca615c678527989a047fa0c427828f", "tree": "878739be9ffd07e7dc58c3601b9da486e354ff88", "parents": [ "72f4634d3901506a2ddb271c123bf5d39b4dee89" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 07 22:42:23 2024 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 07 22:42:23 2024 -0700" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: I7ed8ebe016b25eda1387e60100c7202a4eab2817\n" }, { "commit": "72f4634d3901506a2ddb271c123bf5d39b4dee89", "tree": "c9210f1d624a4970165223064bf51f7ac7865ede", "parents": [ "3d7976323b6cb977eb8597aae16e828a5ce23cb4", "2448a586d291f54ad8c735f969297df7c177736b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 20 21:09:08 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 20 21:09:08 2024 +0000" }, "message": "[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 2448a586d2 -s ours\n\nam skip reason: Merged-In I04dce5c4a3a5ae57d0c3da8e4a924e6e02eb4949 with SHA-1 3b38d3e01d is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/27908784\n\nChange-Id: I633f0b43a7c020bfae26986f5036359a936493dc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2448a586d291f54ad8c735f969297df7c177736b", "tree": "c9210f1d624a4970165223064bf51f7ac7865ede", "parents": [ "462108ee6374101d3ec784789320821e35a5136f", "cbf046dc47f228d58fbe930f1d4b9914d7bf1ba6" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 14:13:43 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 14:13:43 2024 -0700" }, "message": "Merge 24Q3 (ab/11976889) to aosp-main-future\n\nBug: 347831320\nMerged-In: I04dce5c4a3a5ae57d0c3da8e4a924e6e02eb4949\nChange-Id: I93d9e61e0946fd9e3c51db9b164ceb89f6bcb7eb\n" }, { "commit": "3d7976323b6cb977eb8597aae16e828a5ce23cb4", "tree": "c9210f1d624a4970165223064bf51f7ac7865ede", "parents": [ "24ce5a91af8c5222543d052f61b8f7e823c4bbfa", "462108ee6374101d3ec784789320821e35a5136f" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 05:57:38 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 18 05:57:38 2024 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 14 QPR3 to AOSP main\" into main am: 322c1d2c5b -s ours am: 462108ee63 -s ours\n\nam skip reason: Merged-In I1c183ecfe38d3cbefe06d8bf4446ab1e1ee8001d with SHA-1 ef51b77c42 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/3132214\n\nChange-Id: I546221c614af333449e905d9e713759eb4c93436\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "24ce5a91af8c5222543d052f61b8f7e823c4bbfa", "tree": "c9210f1d624a4970165223064bf51f7ac7865ede", "parents": [ "cbf046dc47f228d58fbe930f1d4b9914d7bf1ba6", "e97cb91ab8bc70d0b6408545edff93bf1c635cc5" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 05:55:43 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 18 05:55:43 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR3 to AOSP main am: afca0c759d -s ours am: e97cb91ab8 -s ours\n\nam skip reason: Merged-In I1c183ecfe38d3cbefe06d8bf4446ab1e1ee8001d with SHA-1 ef51b77c42 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/3132214\n\nChange-Id: If608b4d907500465afc5596687f673ab208665a9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "462108ee6374101d3ec784789320821e35a5136f", "tree": "f0a6cb77f84ec733d6b8366030f9af0b34245cf6", "parents": [ "e97cb91ab8bc70d0b6408545edff93bf1c635cc5", "322c1d2c5b16712eff7b9ebd5c50c89c455bb72d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jun 17 20:43:27 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 17 20:43:27 2024 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 14 QPR3 to AOSP main\" into main am: 322c1d2c5b -s ours\n\nam skip reason: Merged-In I1c183ecfe38d3cbefe06d8bf4446ab1e1ee8001d with SHA-1 ef51b77c42 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/3132214\n\nChange-Id: I060f5522b5a5fba4acdc7384af5144e60905559f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e97cb91ab8bc70d0b6408545edff93bf1c635cc5", "tree": "f0a6cb77f84ec733d6b8366030f9af0b34245cf6", "parents": [ "6336e2aae5490a26df24d8fdacc90381bf2384d3", "afca0c759d104bd5ba42306b6d449274f634dbbe" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jun 17 20:41:26 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 17 20:41:26 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR3 to AOSP main am: afca0c759d -s ours\n\nam skip reason: Merged-In I1c183ecfe38d3cbefe06d8bf4446ab1e1ee8001d with SHA-1 ef51b77c42 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/3132214\n\nChange-Id: I8a2c15ab13b2ab0f732b5e61f69a55f8a95cf823\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "322c1d2c5b16712eff7b9ebd5c50c89c455bb72d", "tree": "f0a6cb77f84ec733d6b8366030f9af0b34245cf6", "parents": [ "2df903362ba579d4d3fbdfb6571efe37f6d6ae1d", "afca0c759d104bd5ba42306b6d449274f634dbbe" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jun 17 18:51:36 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jun 17 18:51:36 2024 +0000" }, "message": "Merge \"Merge Android 14 QPR3 to AOSP main\" into main" }, { "commit": "dfe983004b776f1949ae96562e17b44dac146fa0", "tree": "c9210f1d624a4970165223064bf51f7ac7865ede", "parents": [ "a06cf01fb798800f1e7c38db902de5cff733a670", "cbf046dc47f228d58fbe930f1d4b9914d7bf1ba6" ], "author": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Sat Jun 15 21:22:04 2024 +0000" }, "committer": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Sat Jun 15 21:22:04 2024 +0000" }, "message": "Snap for 11975806 from cbf046dc47f228d58fbe930f1d4b9914d7bf1ba6 to 24Q3-release\n\nChange-Id: I02a41d39e10c7224626bbe7a7f58d40d094ac4cf\n" }, { "commit": "cbf046dc47f228d58fbe930f1d4b9914d7bf1ba6", "tree": "c9210f1d624a4970165223064bf51f7ac7865ede", "parents": [ "a082c7632128f2e03960f2c92299eb3bbe597bd2", "6336e2aae5490a26df24d8fdacc90381bf2384d3" ], "author": { "name": "Kevin Liu", "email": "congxiliu@google.com", "time": "Fri Jun 14 22:07:45 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 14 22:07:45 2024 +0000" }, "message": "[automerger skipped] Merge \"Add strict_mode: false\" into main am: 2df903362b am: 6336e2aae5 -s ours\n\nam skip reason: Merged-In I04dce5c4a3a5ae57d0c3da8e4a924e6e02eb4949 with SHA-1 3b38d3e01d is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/3074824\n\nChange-Id: I00c0421039c3401d402fb27661ed0d8c903bef13\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6336e2aae5490a26df24d8fdacc90381bf2384d3", "tree": "f0a6cb77f84ec733d6b8366030f9af0b34245cf6", "parents": [ "ef51b77c425b5162195813f3749e9239bf6b9462", "2df903362ba579d4d3fbdfb6571efe37f6d6ae1d" ], "author": { "name": "Kevin Liu", "email": "congxiliu@google.com", "time": "Fri Jun 14 21:45:21 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 14 21:45:21 2024 +0000" }, "message": "Merge \"Add strict_mode: false\" into main am: 2df903362b\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/3074824\n\nChange-Id: I4a98b820db7f158d87fc0d250a7e2f4ca95cbeeb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2df903362ba579d4d3fbdfb6571efe37f6d6ae1d", "tree": "01c746970420d85fbf2ee37b18925bd48c3892bf", "parents": [ "6c0089efc5463cccc516a266fb129984e161305f", "eed31e6c0cf74c039828ed8bb9601ee5d60b3e21" ], "author": { "name": "Kevin Liu", "email": "congxiliu@google.com", "time": "Fri Jun 14 21:23:48 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jun 14 21:23:48 2024 +0000" }, "message": "Merge \"Add strict_mode: false\" into main" }, { "commit": "afca0c759d104bd5ba42306b6d449274f634dbbe", "tree": "a4f72542dac6636c2932d8c0798105d6f3d1b79d", "parents": [ "6c0089efc5463cccc516a266fb129984e161305f", "ef51b77c425b5162195813f3749e9239bf6b9462" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 13 10:50:25 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 13 10:50:25 2024 -0700" }, "message": "Merge Android 14 QPR3 to AOSP main\n\nBug: 346855327\nMerged-In: I1c183ecfe38d3cbefe06d8bf4446ab1e1ee8001d\nChange-Id: Ib6d642e48d82827f75536209891b04b14638ac15\n" }, { "commit": "eed31e6c0cf74c039828ed8bb9601ee5d60b3e21", "tree": "a478e21ba3b0e0c8604fc90aa136bf05e9a51d19", "parents": [ "4b7684a7b37bb58f91e2ca27fada17559c7ea772" ], "author": { "name": "Kevin Liu", "email": "congxiliu@google.com", "time": "Fri May 03 19:20:01 2024 +0000" }, "committer": { "name": "Kevin Liu", "email": "congxiliu@google.com", "time": "Fri May 31 23:02:59 2024 +0000" }, "message": "Add strict_mode: false\n\nAs strict mode is in place, the default strict_mode is now set to true. We are encourage teams to write tests in strict_mode to make tests Bivalent (able to run on device and devicelessly)\nFor more info on strict mode: go/roboStrictMode\n\nTest: atest KeyChainRoboTests\nBug: 334089788\nChange-Id: I6ea1faa6766a4bdfd98a4d3ccdde5d22a071983e\nMerged-In: I04dce5c4a3a5ae57d0c3da8e4a924e6e02eb4949\n" }, { "commit": "a06cf01fb798800f1e7c38db902de5cff733a670", "tree": "c9210f1d624a4970165223064bf51f7ac7865ede", "parents": [ "74c463018b865548addf167dbb81c175929b9368", "a082c7632128f2e03960f2c92299eb3bbe597bd2" ], "author": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Wed May 29 23:22:08 2024 +0000" }, "committer": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Wed May 29 23:22:08 2024 +0000" }, "message": "Snap for 11902131 from a082c7632128f2e03960f2c92299eb3bbe597bd2 to 24Q3-release\n\nChange-Id: I81d492bb0cb7bcdf7f7878488901a1b287fcb887\n" }, { "commit": "a082c7632128f2e03960f2c92299eb3bbe597bd2", "tree": "c9210f1d624a4970165223064bf51f7ac7865ede", "parents": [ "5643ce3ee4d98e97bf1868672dba4a7f413a0239", "3b38d3e01d6776b00b19c5c40b88fdeb04b83c94" ], "author": { "name": "Kevin Liu", "email": "congxiliu@google.com", "time": "Tue May 28 20:09:04 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 28 20:09:04 2024 +0000" }, "message": "Merge \"Add strict_mode: false\" into main" }, { "commit": "74c463018b865548addf167dbb81c175929b9368", "tree": "5e322e0c5c5372a0f1603fe7489bb21397dd0283", "parents": [ "4015e6d2a233cc51f76c734de873d7a63f1aefd1", "5643ce3ee4d98e97bf1868672dba4a7f413a0239" ], "author": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Sat May 18 03:21:45 2024 +0000" }, "committer": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Sat May 18 03:21:45 2024 +0000" }, "message": "Snap for 11859356 from 5643ce3ee4d98e97bf1868672dba4a7f413a0239 to 24Q3-release\n\nChange-Id: If411369a1b328e28fd3d7c21c673ab1cf1f64df2\n" }, { "commit": "3b38d3e01d6776b00b19c5c40b88fdeb04b83c94", "tree": "cd211ca2be60c895f8109451b0f4ddf0f5f52b88", "parents": [ "3a8ade1b4f468b4657e732d258f123ec63c28c5a" ], "author": { "name": "Kevin Liu", "email": "congxiliu@google.com", "time": "Tue May 07 23:41:04 2024 +0000" }, "committer": { "name": "Kevin Liu", "email": "congxiliu@google.com", "time": "Fri May 17 13:19:37 2024 +0000" }, "message": "Add strict_mode: false\n\nAs strict mode is in place, the default strict_mode is now set to true. We are encourage teams to write tests in strict_mode to make tests Bivalent (able to run on device and devicelessly)\nFor more info on strict mode: go/roboStrictMode\n\nTest: atest KeyChainRoboTests\nBug: 334089788\nChange-Id: I04dce5c4a3a5ae57d0c3da8e4a924e6e02eb4949\n" }, { "commit": "5643ce3ee4d98e97bf1868672dba4a7f413a0239", "tree": "5e322e0c5c5372a0f1603fe7489bb21397dd0283", "parents": [ "40dfc30a6474ebb09720e3e519fd973b03b5511f" ], "author": { "name": "Pavel Grafov", "email": "pgrafov@google.com", "time": "Thu May 16 17:57:59 2024 +0100" }, "committer": { "name": "Pavel Grafov", "email": "pgrafov@google.com", "time": "Thu May 16 18:05:59 2024 +0100" }, "message": "Disable eager JetPack init in KeyChain.\n\nBug: 309895333\nTest: atest CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.MixedDeviceOwnerTest#testKeyManagement\nTest: manual with TestDPC\nChange-Id: I030ef76d360dee8909943bee1fd8497bb0ab37b7\n" }, { "commit": "4015e6d2a233cc51f76c734de873d7a63f1aefd1", "tree": "a4f72542dac6636c2932d8c0798105d6f3d1b79d", "parents": [ "af1c12d2817942b7355f5a382b093d1fdc635490", "40dfc30a6474ebb09720e3e519fd973b03b5511f" ], "author": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Sat May 11 01:21:01 2024 +0000" }, "committer": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Sat May 11 01:21:01 2024 +0000" }, "message": "Snap for 11828632 from 40dfc30a6474ebb09720e3e519fd973b03b5511f to 24Q3-release\n\nChange-Id: I772a898027545209faf5e09954654f31409e759b\n" }, { "commit": "40dfc30a6474ebb09720e3e519fd973b03b5511f", "tree": "a4f72542dac6636c2932d8c0798105d6f3d1b79d", "parents": [ "409df980c11690ddf53c73b5875213480c7dd2dc", "ef51b77c425b5162195813f3749e9239bf6b9462" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri May 10 05:27:42 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri May 10 05:27:42 2024 +0000" }, "message": "[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: ef51b77c42 -s ours\n\nam skip reason: Merged-In I6ffd20c669a2fa6c34410c9c8b1dd2e3c59bffcb with SHA-1 43f509924e is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/27274004\n\nChange-Id: Idad00335c392cdffa4b64b180cc80007c8dc3e48\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "af1c12d2817942b7355f5a382b093d1fdc635490", "tree": "a4f72542dac6636c2932d8c0798105d6f3d1b79d", "parents": [ "a2f9468aafcaf5d36c18f2ce9319bd593d1b9c41", "409df980c11690ddf53c73b5875213480c7dd2dc" ], "author": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Mon May 06 23:22:19 2024 +0000" }, "committer": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Mon May 06 23:22:19 2024 +0000" }, "message": "Snap for 11806096 from 409df980c11690ddf53c73b5875213480c7dd2dc to 24Q3-release\n\nChange-Id: Ibcaaaac0bbb6bf55f86b6d296bdea9e42957d09d\n" }, { "commit": "ef51b77c425b5162195813f3749e9239bf6b9462", "tree": "a4f72542dac6636c2932d8c0798105d6f3d1b79d", "parents": [ "365b621bc037775e4ba3c08091a43c9868df8b94", "b39547aa30a13f791fe41b9451c7aa80c48ae42a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon May 06 12:09:30 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon May 06 12:09:30 2024 -0700" }, "message": "Merge Android 24Q2 Release (ab/11526283) to aosp-main-future\n\nBug: 337098550\nMerged-In: I6ffd20c669a2fa6c34410c9c8b1dd2e3c59bffcb\nChange-Id: I1c183ecfe38d3cbefe06d8bf4446ab1e1ee8001d\n" }, { "commit": "409df980c11690ddf53c73b5875213480c7dd2dc", "tree": "a4f72542dac6636c2932d8c0798105d6f3d1b79d", "parents": [ "3a8ade1b4f468b4657e732d258f123ec63c28c5a", "365b621bc037775e4ba3c08091a43c9868df8b94" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Mon May 06 18:08:55 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon May 06 18:08:55 2024 +0000" }, "message": "Merge \"Use KeyProperties.UID_SELF instead of KeyStore.UID_SELF\" into main am: 6c0089efc5 am: 365b621bc0\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/3061909\n\nChange-Id: I8fa366ca8f3f9f9e339a759fb3ec0e6a812b8391\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "365b621bc037775e4ba3c08091a43c9868df8b94", "tree": "741693a3395c21c2c980e514dda745f626499154", "parents": [ "44c2a1fa49b393b9e061fae8be8a1501ad4b566d", "6c0089efc5463cccc516a266fb129984e161305f" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Mon May 06 17:52:17 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon May 06 17:52:17 2024 +0000" }, "message": "Merge \"Use KeyProperties.UID_SELF instead of KeyStore.UID_SELF\" into main am: 6c0089efc5\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/3061909\n\nChange-Id: Ia5d6dd8c89074d4461d3d4eb7afc52c11024610b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6c0089efc5463cccc516a266fb129984e161305f", "tree": "741693a3395c21c2c980e514dda745f626499154", "parents": [ "4b7684a7b37bb58f91e2ca27fada17559c7ea772", "a358b291201aa7a922b74d385e0a260fd4684e36" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Mon May 06 17:35:31 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon May 06 17:35:31 2024 +0000" }, "message": "Merge \"Use KeyProperties.UID_SELF instead of KeyStore.UID_SELF\" into main" }, { "commit": "a358b291201aa7a922b74d385e0a260fd4684e36", "tree": "741693a3395c21c2c980e514dda745f626499154", "parents": [ "4b7684a7b37bb58f91e2ca27fada17559c7ea772" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Thu Apr 25 19:18:01 2024 +0000" }, "committer": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Thu Apr 25 19:49:53 2024 +0000" }, "message": "Use KeyProperties.UID_SELF instead of KeyStore.UID_SELF\n\nSince the class \u0027android.security.KeyStore\u0027 is going away, the UID_SELF\nconstant is being moved to a more appropriate location in KeyProperties.\nUpdate code that references this constant to use the new location. No\nchange in behavior; the value of the constant remains the same.\n\nBug: 326508120\nTest: build\nFlag: NONE mechanical refactoring with no behavior change\nChange-Id: I7b00e03956098d980ec384836d3e00e64241ffbc\n" }, { "commit": "a2f9468aafcaf5d36c18f2ce9319bd593d1b9c41", "tree": "28d0d6ea78b8062b06124f32448106c7e0d65d48", "parents": [ "7f811af0a4292bed28016994db01504a20f56e02", "3a8ade1b4f468b4657e732d258f123ec63c28c5a" ], "author": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Mon Apr 22 23:21:17 2024 +0000" }, "committer": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Mon Apr 22 23:21:17 2024 +0000" }, "message": "Snap for 11746631 from 3a8ade1b4f468b4657e732d258f123ec63c28c5a to 24Q3-release\n\nChange-Id: I01636718b658f480ec2090d0c6dec4db08163eaf\n" }, { "commit": "3a8ade1b4f468b4657e732d258f123ec63c28c5a", "tree": "28d0d6ea78b8062b06124f32448106c7e0d65d48", "parents": [ "f46be3254aeaa1272354b3f04b921184768d53ba", "44c2a1fa49b393b9e061fae8be8a1501ad4b566d" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Apr 22 18:02:33 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 22 18:02:33 2024 +0000" }, "message": "Merge \"Migrate Test Targets to New Android Ownership Model\" into main am: 4b7684a7b3 am: 44c2a1fa49\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2945330\n\nChange-Id: Icf67d7b85ea8e90e7cca1bb77cffffd7d028b615\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "44c2a1fa49b393b9e061fae8be8a1501ad4b566d", "tree": "6440ef15a3b680202f178a8a4b4aa4fa44c0414f", "parents": [ "1be2f3da911aa4e15ca3b0c9486b285ab363abca", "4b7684a7b37bb58f91e2ca27fada17559c7ea772" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Apr 22 17:40:30 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 22 17:40:30 2024 +0000" }, "message": "Merge \"Migrate Test Targets to New Android Ownership Model\" into main am: 4b7684a7b3\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2945330\n\nChange-Id: I1d907d8eaed65e3747ffee7f9d33bb1fb448c9bb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4b7684a7b37bb58f91e2ca27fada17559c7ea772", "tree": "6440ef15a3b680202f178a8a4b4aa4fa44c0414f", "parents": [ "8bce44e08bbc3d3f61161fb7266106d893709971", "d70739e5d53ad5f32fdca08ffa60eb1c661d4300" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Apr 22 16:43:08 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Apr 22 16:43:08 2024 +0000" }, "message": "Merge \"Migrate Test Targets to New Android Ownership Model\" into main" }, { "commit": "d70739e5d53ad5f32fdca08ffa60eb1c661d4300", "tree": "b40ec35b7742c77ffc48a2850e8f60fda30bc06e", "parents": [ "4f68c72394041603bf47bba0b5ba7af53424179a" ], "author": { "name": "Aditya Choudhary", "email": "caditya@google.com", "time": "Fri Feb 02 13:55:52 2024 +0000" }, "committer": { "name": "Ronish Kalia", "email": "ronish@google.com", "time": "Mon Apr 22 15:22:14 2024 +0000" }, "message": "Migrate Test Targets to New Android Ownership Model\n\nThis CL is created as a best effort to migrate test targets to the new Android ownership model.\nIt is based on historical data from repository history and insights from git blame.\nGiven the nature of this effort, there may be instances of incorrect attribution. If you find incorrect or unnecessary\nattribution in this CL, please create a new CL to fix that.\n\nFor detailed guidelines and further information on the migration please refer to the link below,\ngo/new-android-ownership-model\n\nBug: 304529413\nTest: N/A\nChange-Id: If3dcee94f0d21ccf6f757638a4f65a23378b8a13\n" }, { "commit": "7f811af0a4292bed28016994db01504a20f56e02", "tree": "f8964ff7078a68dc81ffccdb84c48c4bf2a99137", "parents": [ "b39547aa30a13f791fe41b9451c7aa80c48ae42a", "f46be3254aeaa1272354b3f04b921184768d53ba" ], "author": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Fri Mar 08 00:20:57 2024 +0000" }, "committer": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Fri Mar 08 00:20:57 2024 +0000" }, "message": "Snap for 11545716 from f46be3254aeaa1272354b3f04b921184768d53ba to 24Q3-release\n\nChange-Id: I4d4a651c3d62fe83f2ed37985ed66c574cccec9c\n" }, { "commit": "f46be3254aeaa1272354b3f04b921184768d53ba", "tree": "f8964ff7078a68dc81ffccdb84c48c4bf2a99137", "parents": [ "ee9fd78417e1f63202fedbf470fefe751415b9de", "1be2f3da911aa4e15ca3b0c9486b285ab363abca" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Mar 07 10:49:50 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 07 10:49:50 2024 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 14 QPR2 to AOSP main\" into main am: 8bce44e08b -s ours am: 1be2f3da91 -s ours\n\nam skip reason: Merged-In I6dcbe0dddbda0734a3e8351c79d0329ae26a2db6 with SHA-1 2e555bb246 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2990861\n\nChange-Id: I0b78cf3a81ff27b895822a1aa2e9e8d7109a3c94\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ee9fd78417e1f63202fedbf470fefe751415b9de", "tree": "f8964ff7078a68dc81ffccdb84c48c4bf2a99137", "parents": [ "b39547aa30a13f791fe41b9451c7aa80c48ae42a", "12cb95c0a48bf77c69ed20c001ddc723810efa17" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Mar 07 10:46:36 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 07 10:46:36 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 574807694f -s ours am: 12cb95c0a4 -s ours\n\nam skip reason: Merged-In I6dcbe0dddbda0734a3e8351c79d0329ae26a2db6 with SHA-1 2e555bb246 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2990861\n\nChange-Id: Icb12f3a19a413e63592702c6b710e47751f054d5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1be2f3da911aa4e15ca3b0c9486b285ab363abca", "tree": "6b682d271b612f7ab0f8fbf3635fc1e48aa51f69", "parents": [ "12cb95c0a48bf77c69ed20c001ddc723810efa17", "8bce44e08bbc3d3f61161fb7266106d893709971" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Mar 07 09:58:32 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 07 09:58:32 2024 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 14 QPR2 to AOSP main\" into main am: 8bce44e08b -s ours\n\nam skip reason: Merged-In I6dcbe0dddbda0734a3e8351c79d0329ae26a2db6 with SHA-1 2e555bb246 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2990861\n\nChange-Id: I5e7ec703d0d22a1ebab09182ea3bfe5a5c5cd3ad\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "12cb95c0a48bf77c69ed20c001ddc723810efa17", "tree": "6b682d271b612f7ab0f8fbf3635fc1e48aa51f69", "parents": [ "2e555bb2466944f8201629799070dc92dc7dd551", "574807694f12155e67a40b338123db750919e8d0" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Mar 07 09:55:11 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 07 09:55:11 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 574807694f -s ours\n\nam skip reason: Merged-In I6dcbe0dddbda0734a3e8351c79d0329ae26a2db6 with SHA-1 2e555bb246 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2990861\n\nChange-Id: Ie7c2d51553b785fd8d325c2afc91a18ba2657240\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8bce44e08bbc3d3f61161fb7266106d893709971", "tree": "6b682d271b612f7ab0f8fbf3635fc1e48aa51f69", "parents": [ "4f68c72394041603bf47bba0b5ba7af53424179a", "574807694f12155e67a40b338123db750919e8d0" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Mar 07 06:44:18 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Mar 07 06:44:18 2024 +0000" }, "message": "Merge \"Merge Android 14 QPR2 to AOSP main\" into main" }, { "commit": "574807694f12155e67a40b338123db750919e8d0", "tree": "6b682d271b612f7ab0f8fbf3635fc1e48aa51f69", "parents": [ "4f68c72394041603bf47bba0b5ba7af53424179a", "2e555bb2466944f8201629799070dc92dc7dd551" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Mar 06 09:30:05 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Mar 06 09:30:05 2024 -0800" }, "message": "Merge Android 14 QPR2 to AOSP main\n\nBug: 319669529\nMerged-In: I6dcbe0dddbda0734a3e8351c79d0329ae26a2db6\nChange-Id: I42aeec49ff8b07efa2126582c3f1b3cec6339b16\n" }, { "commit": "b39547aa30a13f791fe41b9451c7aa80c48ae42a", "tree": "f8964ff7078a68dc81ffccdb84c48c4bf2a99137", "parents": [ "43f509924e752c35834772e421997f1e640c7374", "2e555bb2466944f8201629799070dc92dc7dd551" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jan 31 02:02:46 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 31 02:02:46 2024 +0000" }, "message": "[automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: 2e555bb246 -s ours\n\nam skip reason: Merged-In I87a1e2961f6737d107687d130e87324d3649c71b with SHA-1 4e234630aa is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/25974046\n\nChange-Id: Icba1e8aaea430a29238610e33c11f03b0637794a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2e555bb2466944f8201629799070dc92dc7dd551", "tree": "6b682d271b612f7ab0f8fbf3635fc1e48aa51f69", "parents": [ "47f3bad4ef9d9a0eaf3481ed74bdb8e8a06bf76d", "8fb3a8160df7dd726920464d5f30443ecc82e035" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jan 17 22:14:20 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jan 17 22:14:20 2024 -0800" }, "message": "Merge Android 24Q1 Release (ab/11220357)\n\nBug: 319669529\nMerged-In: I87a1e2961f6737d107687d130e87324d3649c71b\nChange-Id: I6dcbe0dddbda0734a3e8351c79d0329ae26a2db6\n" }, { "commit": "43f509924e752c35834772e421997f1e640c7374", "tree": "f8964ff7078a68dc81ffccdb84c48c4bf2a99137", "parents": [ "8fb3a8160df7dd726920464d5f30443ecc82e035" ], "author": { "name": "Ayush Sharma", "email": "ayushsha@google.com", "time": "Mon Jan 15 12:14:20 2024 +0000" }, "committer": { "name": "Ayush Sharma", "email": "ayushsha@google.com", "time": "Mon Jan 15 12:14:20 2024 +0000" }, "message": "Handle assertion error while binding to keychain\n\nBug: 318087089\nTest: NA\nChange-Id: I6ffd20c669a2fa6c34410c9c8b1dd2e3c59bffcb\n" }, { "commit": "8fb3a8160df7dd726920464d5f30443ecc82e035", "tree": "6b682d271b612f7ab0f8fbf3635fc1e48aa51f69", "parents": [ "62a2c4d78f4c036d32b6050731dbb88d7fe2f05b", "73f6b6822c5e119b0894f3d722e1736be48193cd" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Dec 11 23:00:49 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 11 23:00:49 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 14 QPR1\" into main am: 4f68c72394 -s ours am: 47f3bad4ef -s ours am: 73f6b6822c -s ours\n\nam skip reason: Merged-In Ib9e965e47015ff54230ee7863bc4ec4bac510133 with SHA-1 6da1906643 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2865657\n\nChange-Id: Ic35389e5b7dc926e093d7efadedd35d2e2e6992c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "62a2c4d78f4c036d32b6050731dbb88d7fe2f05b", "tree": "6b682d271b612f7ab0f8fbf3635fc1e48aa51f69", "parents": [ "29356d4c46a03ba6421107ee47a729af3b594d90", "8584fb67f69550b11954c340b55188ceb283b7fa" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Dec 11 22:57:42 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 11 22:57:42 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR1 am: 8fbfe4ea28 -s ours am: 872ecc3e95 -s ours am: 8584fb67f6 -s ours\n\nam skip reason: Merged-In Ib9e965e47015ff54230ee7863bc4ec4bac510133 with SHA-1 6da1906643 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2865657\n\nChange-Id: I700f14bbffb9a4c04c4f61d006391d843f03ac50\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "73f6b6822c5e119b0894f3d722e1736be48193cd", "tree": "afe6b90ee732c0dd91702da1e0f80c263b20ac99", "parents": [ "8584fb67f69550b11954c340b55188ceb283b7fa", "47f3bad4ef9d9a0eaf3481ed74bdb8e8a06bf76d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Dec 11 22:05:36 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 11 22:05:36 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 14 QPR1\" into main am: 4f68c72394 -s ours am: 47f3bad4ef -s ours\n\nam skip reason: Merged-In Ib9e965e47015ff54230ee7863bc4ec4bac510133 with SHA-1 6da1906643 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2865657\n\nChange-Id: Ib393696a6dc6bc4aca2d6fe7b739c319086ce158\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8584fb67f69550b11954c340b55188ceb283b7fa", "tree": "afe6b90ee732c0dd91702da1e0f80c263b20ac99", "parents": [ "03ab3b0be86f3bf22072daf5f3a22bd861ce59c4", "872ecc3e9539b1b9f35578453321e4d497221218" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Dec 11 22:02:29 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 11 22:02:29 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR1 am: 8fbfe4ea28 -s ours am: 872ecc3e95 -s ours\n\nam skip reason: Merged-In Ib9e965e47015ff54230ee7863bc4ec4bac510133 with SHA-1 6da1906643 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2865657\n\nChange-Id: Ida93ec32e32ded2a73cc1b5a12f86120e58c51fc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "47f3bad4ef9d9a0eaf3481ed74bdb8e8a06bf76d", "tree": "afe6b90ee732c0dd91702da1e0f80c263b20ac99", "parents": [ "872ecc3e9539b1b9f35578453321e4d497221218", "4f68c72394041603bf47bba0b5ba7af53424179a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Dec 11 21:19:54 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 11 21:19:54 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 14 QPR1\" into main am: 4f68c72394 -s ours\n\nam skip reason: Merged-In Ib9e965e47015ff54230ee7863bc4ec4bac510133 with SHA-1 6da1906643 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2865657\n\nChange-Id: I0f3a6758b7e2cc5a923b211794c0ca3e2ebcb2f1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "872ecc3e9539b1b9f35578453321e4d497221218", "tree": "afe6b90ee732c0dd91702da1e0f80c263b20ac99", "parents": [ "6da190664351efd51ed311b0e76c061f9dbe8cb3", "8fbfe4ea2836a21b606faf34a4b06d80f74b2d37" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Dec 11 21:16:40 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 11 21:16:40 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR1 am: 8fbfe4ea28 -s ours\n\nam skip reason: Merged-In Ib9e965e47015ff54230ee7863bc4ec4bac510133 with SHA-1 6da1906643 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2865657\n\nChange-Id: I25de2c01165587a79161fae491a57fb83a83d66c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4f68c72394041603bf47bba0b5ba7af53424179a", "tree": "afe6b90ee732c0dd91702da1e0f80c263b20ac99", "parents": [ "b56668e8a07d07189c2fc184599a69cd2ace3558", "8fbfe4ea2836a21b606faf34a4b06d80f74b2d37" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Dec 09 00:12:06 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Sat Dec 09 00:12:06 2023 +0000" }, "message": "Merge \"Merge Android 14 QPR1\" into main" }, { "commit": "8fbfe4ea2836a21b606faf34a4b06d80f74b2d37", "tree": "afe6b90ee732c0dd91702da1e0f80c263b20ac99", "parents": [ "b56668e8a07d07189c2fc184599a69cd2ace3558", "6da190664351efd51ed311b0e76c061f9dbe8cb3" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 08 13:14:19 2023 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 08 13:14:19 2023 -0800" }, "message": "Merge Android 14 QPR1\n\nMerged-In: Ib9e965e47015ff54230ee7863bc4ec4bac510133\nBug: 315507370\nChange-Id: Ia4f4219216922dbea9076e4742e8d2486df9a66c\n" }, { "commit": "29356d4c46a03ba6421107ee47a729af3b594d90", "tree": "6b682d271b612f7ab0f8fbf3635fc1e48aa51f69", "parents": [ "861432e84ececebbc20a250c7657ee00bc61cc30", "03ab3b0be86f3bf22072daf5f3a22bd861ce59c4" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 19 23:54:42 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 19 23:54:42 2023 +0000" }, "message": "[automerger skipped] Merge 10952656 am: 6da1906643 -s ours am: 03ab3b0be8 -s ours\n\nam skip reason: Merged-In I99ad17cdfa0324e623b4674332922c8bf2db263e with SHA-1 1fd1f257fa is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/25089498\n\nChange-Id: Icf75608f5f1a23bf9b7c0af9bf6f3df9a8216788\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "03ab3b0be86f3bf22072daf5f3a22bd861ce59c4", "tree": "afe6b90ee732c0dd91702da1e0f80c263b20ac99", "parents": [ "1fd1f257fa59e696c1b9572673c25b62e74c7a18", "6da190664351efd51ed311b0e76c061f9dbe8cb3" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 19 18:47:56 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 19 18:47:56 2023 +0000" }, "message": "[automerger skipped] Merge 10952656 am: 6da1906643 -s ours\n\nam skip reason: Merged-In I99ad17cdfa0324e623b4674332922c8bf2db263e with SHA-1 1fd1f257fa is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/25089498\n\nChange-Id: Icf46499c811f0764e5df35041284a50f8879d525\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6da190664351efd51ed311b0e76c061f9dbe8cb3", "tree": "afe6b90ee732c0dd91702da1e0f80c263b20ac99", "parents": [ "c21a09b09a61eec351c055a22df984d279cd8a6a", "1fd1f257fa59e696c1b9572673c25b62e74c7a18" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Oct 17 10:08:47 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Oct 17 10:08:47 2023 -0700" }, "message": "Merge 10952656\n\nMerged-In: I99ad17cdfa0324e623b4674332922c8bf2db263e\nChange-Id: Ib9e965e47015ff54230ee7863bc4ec4bac510133\n" }, { "commit": "861432e84ececebbc20a250c7657ee00bc61cc30", "tree": "6b682d271b612f7ab0f8fbf3635fc1e48aa51f69", "parents": [ "47b830a8c58d79f2c415fb9f2283a8d68608196d", "1fd1f257fa59e696c1b9572673c25b62e74c7a18" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Sat Oct 07 09:50:17 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Oct 07 09:50:17 2023 +0000" }, "message": "Merge \"Clean up obsolete aliases for Truth.\" into main am: b56668e8a0 am: c21a09b09a am: f96ef6ebef am: 7ced43455c am: 1fd1f257fa\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2777193\n\nChange-Id: I532538c149d92e23ab7f7d1c180d9bbaa5ec60cf\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" } ], "next": "1fd1f257fa59e696c1b9572673c25b62e74c7a18" }