)]}' { "log": [ { "commit": "9a1475ff327ccae16519429e7a2b66c4cacafd2f", "tree": "62cce3721b77145c757e606760ecccbc16c85c53", "parents": [ "a9f4490996575fa6f9374d30b017d615c523e7cd", "51518589f751f5888c2868f8313231e3f34a41b8" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Mar 08 16:10:00 2025 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Mar 08 16:10:00 2025 -0800" }, "message": "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main\n\nBug: 385190204\nMerged-In: Ia641e75259becaf630064640884541f297278422\nChange-Id: I570593737aeb4b8704fadd8ec203542a771fa6b3\n" }, { "commit": "51518589f751f5888c2868f8313231e3f34a41b8", "tree": "62cce3721b77145c757e606760ecccbc16c85c53", "parents": [ "a9f4490996575fa6f9374d30b017d615c523e7cd", "2242620f251888d1baae60fb557f19a0710633af" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Feb 10 14:08:20 2025 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Feb 10 14:08:20 2025 -0800" }, "message": "Merge 25Q1 (ab/12770256) to aosp-main-future\n\nBug: 385190204\nMerged-In: I53f0a23efb036d107e16acd9b2f4220bfe8823a0\nChange-Id: I97c8d6c41e584dd2413dc4ba062c5cce48355918\n" }, { "commit": "2242620f251888d1baae60fb557f19a0710633af", "tree": "62cce3721b77145c757e606760ecccbc16c85c53", "parents": [ "53b0b5de1b1a7f096d80649ab4eca2e707397050" ], "author": { "name": "Michael Groover", "email": "mpgroover@google.com", "time": "Mon Nov 18 22:40:42 2024 -0600" }, "committer": { "name": "Michael Groover", "email": "mpgroover@google.com", "time": "Mon Nov 18 22:40:42 2024 -0600" }, "message": "Add WRITE_ALLOWLISTED_DEVICE_CONFIG perm when modifying DeviceConfig\n\nAndroid 16 introduces restrictions on the DeviceConfig flags that\ncan be modified by the shell user by removing the WRITE_DEVICE_CONFIG\npermission from this user and replacing it with the\nWRITE_ALLOWLISTED_DEVICE_CONFIG permission; with this permission,\nonly those flags that have been allowlisted can be modified. This\ncommit adds the ALLOWLISTED permission to any test that explicitly\nadopts the shell permission identity with the WRITE_DEVICE_CONFIG\npermission; the WRITE_DEVICE_CONFIG permission is not removed to\nensure tests do not break when run on previous platform releases\nwithout the ALLOWLISTED permission.\n\nBug: 364083026\nFlag: TEST_ONLY\nTest: Manually ran all modified tests\nChange-Id: I53f0a23efb036d107e16acd9b2f4220bfe8823a0\n" }, { "commit": "53b0b5de1b1a7f096d80649ab4eca2e707397050", "tree": "9d14414e2ae04b641bbf09d9a6809eb53140ef6c", "parents": [ "baad030bc3d0602eba7d5c9ceb830e555bd90ab0", "a9f4490996575fa6f9374d30b017d615c523e7cd" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Wed Oct 23 03:05:18 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 23 03:05:18 2024 +0000" }, "message": "Remove dependencies on the 1-variant fallback am: 70e10a4dad am: a9f4490996\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/3317681\n\nChange-Id: I917d5fbf71350d86bfd02fe95d4b941fb0f4a4b3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a9f4490996575fa6f9374d30b017d615c523e7cd", "tree": "9d14414e2ae04b641bbf09d9a6809eb53140ef6c", "parents": [ "baad030bc3d0602eba7d5c9ceb830e555bd90ab0", "70e10a4dad4817886aaf07ba2c78caf74f8bf39d" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Wed Oct 23 02:43:30 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 23 02:43:30 2024 +0000" }, "message": "Remove dependencies on the 1-variant fallback am: 70e10a4dad\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/3317681\n\nChange-Id: If1c8870df971c5859a3a6d3ecfc52e307146d51d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "70e10a4dad4817886aaf07ba2c78caf74f8bf39d", "tree": "9d14414e2ae04b641bbf09d9a6809eb53140ef6c", "parents": [ "433ae18dd25770e15a30df3bb40afdf104942603" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Tue Oct 22 16:31:02 2024 -0700" }, "committer": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Tue Oct 22 16:31:02 2024 -0700" }, "message": "Remove dependencies on the 1-variant fallback\n\nWhen adding a dependencies, if the variants don\u0027t match, but the\ndependency only has 1 variant anyways, soong will always use that\nvariant. This makes it hard to add new variants to soong, because the\n1-variant fallback stops being used and you start getting missing\nvariant errors. Make changes to bp files such that all dependencies\ncorrectly specify the variant to use.\n\nBug: 372091092\nFlag: EXEMPT refactor\nTest: m nothing\nChange-Id: I0fea611e4c46e9ce7dcc3d7e4fc38fc2223f1fa7\n" }, { "commit": "baad030bc3d0602eba7d5c9ceb830e555bd90ab0", "tree": "8c7d30a50009c197bfa6ecc3e97e4957f865794f", "parents": [ "1768b1d9774cd7c4b8d1fa6f48f0c5f01612318d", "9a261d30033a5b89ee4e2920703ab53bc2ced758" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 03:10:24 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 03:10:24 2024 +0000" }, "message": "[automerger skipped] Merge 24Q3 to AOSP main am: 433ae18dd2 -s ours am: 9a261d3003 -s ours\n\nam skip reason: Merged-In I493ffe5703e340fabfa27080eacf63fe16655946 with SHA-1 420fc1a203 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/3258248\n\nChange-Id: I0a9a5d425e8533b12430145383d16bdbf7f7919a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9a261d30033a5b89ee4e2920703ab53bc2ced758", "tree": "8c7d30a50009c197bfa6ecc3e97e4957f865794f", "parents": [ "64a528cbcc2214c0671fc81982fd1048158fd0d6", "433ae18dd25770e15a30df3bb40afdf104942603" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 02:14:14 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 02:14:14 2024 +0000" }, "message": "[automerger skipped] Merge 24Q3 to AOSP main am: 433ae18dd2 -s ours\n\nam skip reason: Merged-In I493ffe5703e340fabfa27080eacf63fe16655946 with SHA-1 420fc1a203 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/3258248\n\nChange-Id: I375e9d6737aa5b5e9265f25d4583a522a92223d3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "433ae18dd25770e15a30df3bb40afdf104942603", "tree": "8c7d30a50009c197bfa6ecc3e97e4957f865794f", "parents": [ "ce80ce17b68f2f98599ad4d652f30a399c0e83c2", "64a528cbcc2214c0671fc81982fd1048158fd0d6" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Sep 05 17:03:01 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Sep 05 17:03:01 2024 -0700" }, "message": "Merge 24Q3 to AOSP main\n\nBug: 357762254\nMerged-In: I493ffe5703e340fabfa27080eacf63fe16655946\nChange-Id: I46a41e587ed7c270578be4819e793279e8261a00\n" }, { "commit": "1768b1d9774cd7c4b8d1fa6f48f0c5f01612318d", "tree": "8c7d30a50009c197bfa6ecc3e97e4957f865794f", "parents": [ "ad36f4a9d56140f03f391ec4b982733b6b3e8635", "64a528cbcc2214c0671fc81982fd1048158fd0d6" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Aug 30 18:58:53 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 30 18:58:53 2024 +0000" }, "message": "Make java_sdk_library dependencies explicit am: ce80ce17b6 am: 64a528cbcc\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/3250835\n\nChange-Id: I2fe7b99854d5994e1a70b4b8ff1ab604e246a930\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "64a528cbcc2214c0671fc81982fd1048158fd0d6", "tree": "8c7d30a50009c197bfa6ecc3e97e4957f865794f", "parents": [ "2b3c83642c9170ba85a9700bf33de97826226c73", "ce80ce17b68f2f98599ad4d652f30a399c0e83c2" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Aug 30 18:37:28 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 30 18:37:28 2024 +0000" }, "message": "Make java_sdk_library dependencies explicit am: ce80ce17b6\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/3250835\n\nChange-Id: If85cf36896ce292b36cf59ae6d553950fcdce3ed\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ce80ce17b68f2f98599ad4d652f30a399c0e83c2", "tree": "2e62f9ce84f94e3f4779bf267a7f9be74d96706b", "parents": [ "78e594f5c5f57bcd0741c48b2575fdd896a21b89" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Aug 30 00:30:10 2024 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Aug 30 00:30:10 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: I6186aedd57f7f1c5466d49b627fc8df65af362c2\n" }, { "commit": "ad36f4a9d56140f03f391ec4b982733b6b3e8635", "tree": "07c883ce993a591f0f2590f7a4814c5aab7decca", "parents": [ "e383881692f188c7e813a61907de6a674cf2a9fe", "9ea81ee089a1d1b06f03386b51b9618cc2757bb1" ], "author": { "name": "Tongbo Liu", "email": "liutongbo@google.com", "time": "Thu Jul 11 13:32:55 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jul 11 13:32:55 2024 +0000" }, "message": "[automerger skipped] [RESTRICT AUTOMERGE] Add mcts tags am: ccbd5f16b7 -s ours am: 335453a468 -s ours am: 68ab2144b3 -s ours am: efaae53e50 -s ours am: 9ea81ee089 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/3154238\n\nChange-Id: I87668126acc4f8d1b137c25099c16d159c5d5480\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9ea81ee089a1d1b06f03386b51b9618cc2757bb1", "tree": "ec8bf44d828f80cc7089c6de0e464e367b418200", "parents": [ "e73dd6887a58e99eb39352e54088cb54d9006aa8", "efaae53e50b5407035a3a90eb095904d1dfc45e0" ], "author": { "name": "Tongbo Liu", "email": "liutongbo@google.com", "time": "Thu Jul 11 13:12:23 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jul 11 13:12:23 2024 +0000" }, "message": "[automerger skipped] [RESTRICT AUTOMERGE] Add mcts tags am: ccbd5f16b7 -s ours am: 335453a468 -s ours am: 68ab2144b3 -s ours am: efaae53e50 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/3154238\n\nChange-Id: Ie5cbb04a2fa7b58baf3b9dcb612924ba4864efa7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e383881692f188c7e813a61907de6a674cf2a9fe", "tree": "07c883ce993a591f0f2590f7a4814c5aab7decca", "parents": [ "50d609cfde8146b2a0eb5696036c6b10fee153a4", "95c2ca1275a39c3cf8a0bf96c3dc3cb66e25aeb7" ], "author": { "name": "Tongbo Liu", "email": "liutongbo@google.com", "time": "Thu Jul 11 13:11:42 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jul 11 13:11:42 2024 +0000" }, "message": "[automerger skipped] [RESTRICT AUTOMERGE] Add mcts tags am: ccbd5f16b7 -s ours am: 335453a468 -s ours am: 68ab2144b3 -s ours am: 95c2ca1275 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/3154238\n\nChange-Id: I715bc83857a250c55ab5439459ddec0d0a261940\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "50d609cfde8146b2a0eb5696036c6b10fee153a4", "tree": "07c883ce993a591f0f2590f7a4814c5aab7decca", "parents": [ "35fb9b2fc97a232ce534952ee4f73e626ade43ab", "2b3c83642c9170ba85a9700bf33de97826226c73" ], "author": { "name": "Tongbo Liu", "email": "liutongbo@google.com", "time": "Thu Jul 11 12:48:01 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jul 11 12:48:01 2024 +0000" }, "message": "[automerger skipped] [RESTRICT AUTOMERGE] Add mcts tags am: ccbd5f16b7 -s ours am: 335453a468 -s ours am: 78e594f5c5 -s ours am: 2b3c83642c -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/3154238\n\nChange-Id: Ida38bba26c96b693e85bee92c0997a3fa358a694\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "95c2ca1275a39c3cf8a0bf96c3dc3cb66e25aeb7", "tree": "004f2ef67e615de18b08592d07bf97cfb8e92006", "parents": [ "1785e4be1207351ab58d192b7e258f35a1951809", "68ab2144b3b1ac16db6a27bca2d91a0875decaaa" ], "author": { "name": "Tongbo Liu", "email": "liutongbo@google.com", "time": "Thu Jul 11 12:33:17 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jul 11 12:33:17 2024 +0000" }, "message": "[automerger skipped] [RESTRICT AUTOMERGE] Add mcts tags am: ccbd5f16b7 -s ours am: 335453a468 -s ours am: 68ab2144b3 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/3154238\n\nChange-Id: I862ba0625a2f120c9e19f01f8a9b3702c17b5028\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "efaae53e50b5407035a3a90eb095904d1dfc45e0", "tree": "ec8bf44d828f80cc7089c6de0e464e367b418200", "parents": [ "0636adafc42735af2ddb694c982b5884cffd88c8", "68ab2144b3b1ac16db6a27bca2d91a0875decaaa" ], "author": { "name": "Tongbo Liu", "email": "liutongbo@google.com", "time": "Thu Jul 11 12:32:45 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jul 11 12:32:45 2024 +0000" }, "message": "[automerger skipped] [RESTRICT AUTOMERGE] Add mcts tags am: ccbd5f16b7 -s ours am: 335453a468 -s ours am: 68ab2144b3 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/3154238\n\nChange-Id: I9fc7e0088049f1ac7c839ab4c7df72950b3240ab\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2b3c83642c9170ba85a9700bf33de97826226c73", "tree": "07c883ce993a591f0f2590f7a4814c5aab7decca", "parents": [ "92446d95203e603dad783d8fd342132d254e4735", "78e594f5c5f57bcd0741c48b2575fdd896a21b89" ], "author": { "name": "Tongbo Liu", "email": "liutongbo@google.com", "time": "Thu Jul 11 12:29:01 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jul 11 12:29:01 2024 +0000" }, "message": "[automerger skipped] [RESTRICT AUTOMERGE] Add mcts tags am: ccbd5f16b7 -s ours am: 335453a468 -s ours am: 78e594f5c5 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/3154238\n\nChange-Id: I2c4bd753312fb2e705fade22139585d8ea99040b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "68ab2144b3b1ac16db6a27bca2d91a0875decaaa", "tree": "ec8bf44d828f80cc7089c6de0e464e367b418200", "parents": [ "612e42d525ead00e82b7e52df2325a79034e34a0", "335453a46867aa71dcf6321a7c0062026e7bbd61" ], "author": { "name": "Tongbo Liu", "email": "liutongbo@google.com", "time": "Thu Jul 11 12:17:51 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jul 11 12:17:51 2024 +0000" }, "message": "[automerger skipped] [RESTRICT AUTOMERGE] Add mcts tags am: ccbd5f16b7 -s ours am: 335453a468 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/3154238\n\nChange-Id: I5990bb60e747b17b767ae79784da12055a102960\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "78e594f5c5f57bcd0741c48b2575fdd896a21b89", "tree": "22dfd15939f20dff56984fce92c32503430f31a7", "parents": [ "fcb0170d4a02c4440d2e93ebba89580b6af9c050", "335453a46867aa71dcf6321a7c0062026e7bbd61" ], "author": { "name": "Tongbo Liu", "email": "liutongbo@google.com", "time": "Thu Jul 11 12:11:14 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jul 11 12:11:14 2024 +0000" }, "message": "[automerger skipped] [RESTRICT AUTOMERGE] Add mcts tags am: ccbd5f16b7 -s ours am: 335453a468 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/3154238\n\nChange-Id: Ia546a4c577a7671630d408a1312aae792db476e8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "335453a46867aa71dcf6321a7c0062026e7bbd61", "tree": "ec8bf44d828f80cc7089c6de0e464e367b418200", "parents": [ "804d9d2733d906ec9389397748fb2083537b265b", "ccbd5f16b78be3fa4d7a2fb532e150a8785dc7d7" ], "author": { "name": "Tongbo Liu", "email": "liutongbo@google.com", "time": "Thu Jul 11 11:53:10 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jul 11 11:53:10 2024 +0000" }, "message": "[automerger skipped] [RESTRICT AUTOMERGE] Add mcts tags am: ccbd5f16b7 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/3154238\n\nChange-Id: I9b09ef3faa7f25c2bf72114dc3c07e67b632fea6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ccbd5f16b78be3fa4d7a2fb532e150a8785dc7d7", "tree": "06a8501ad3c292f0656412c9c7c0f891aa880e0f", "parents": [ "f69f8e0598ae1f007a56bf45fcc1c4eb4af5d48e" ], "author": { "name": "Tongbo Liu", "email": "liutongbo@google.com", "time": "Mon Jul 01 10:15:33 2024 +0000" }, "committer": { "name": "Tongbo Liu", "email": "liutongbo@google.com", "time": "Mon Jul 01 10:15:38 2024 +0000" }, "message": "[RESTRICT AUTOMERGE] Add mcts tags\n\nChange-Id: I5b8fff97c0bdb98cb205d096cf6d79cb2848c5c9\nTest: N/A\nBug: 348121429\n" }, { "commit": "35fb9b2fc97a232ce534952ee4f73e626ade43ab", "tree": "07c883ce993a591f0f2590f7a4814c5aab7decca", "parents": [ "7dae2f0ccd4b9b57b7c097191d26672f3427a857", "1785e4be1207351ab58d192b7e258f35a1951809" ], "author": { "name": "Tongbo Liu", "email": "liutongbo@google.com", "time": "Mon Jul 01 05:51:47 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 01 05:51:47 2024 +0000" }, "message": "[automerger skipped] [DO NOT MERGE] Add mcts tags am: 804d9d2733 am: 612e42d525 -s ours am: 1785e4be12 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/3148419\n\nChange-Id: Ieb582a6bf6081573fb0c32f1924431d77ebd318e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1785e4be1207351ab58d192b7e258f35a1951809", "tree": "004f2ef67e615de18b08592d07bf97cfb8e92006", "parents": [ "a47e8c47feca17d73c467050bc53a16ceb29d26d", "612e42d525ead00e82b7e52df2325a79034e34a0" ], "author": { "name": "Tongbo Liu", "email": "liutongbo@google.com", "time": "Mon Jul 01 05:36:31 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 01 05:36:31 2024 +0000" }, "message": "[automerger skipped] [DO NOT MERGE] Add mcts tags am: 804d9d2733 am: 612e42d525 -s ours\n\nam skip reason: skipped by liutongbo\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/3148419\n\nChange-Id: I79d07374cfe4bb87f125f45aef6692a4ea62108f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7dae2f0ccd4b9b57b7c097191d26672f3427a857", "tree": "07c883ce993a591f0f2590f7a4814c5aab7decca", "parents": [ "91d8ded1f69f7f97f59c1bd3af72efc5ef8f383f", "e73dd6887a58e99eb39352e54088cb54d9006aa8" ], "author": { "name": "Tongbo Liu", "email": "liutongbo@google.com", "time": "Mon Jul 01 04:57:08 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 01 04:57:08 2024 +0000" }, "message": "[automerger skipped] [DO NOT MERGE] Add mcts tags am: 804d9d2733 am: 612e42d525 am: 0636adafc4 am: e73dd6887a -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/3148419\n\nChange-Id: I2fdd622104c8502e71903f2eb8148286f88d54bc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e73dd6887a58e99eb39352e54088cb54d9006aa8", "tree": "ec8bf44d828f80cc7089c6de0e464e367b418200", "parents": [ "4f2c8ea06cb45435c3b8eab9122f2e6ecd9294ba", "0636adafc42735af2ddb694c982b5884cffd88c8" ], "author": { "name": "Tongbo Liu", "email": "liutongbo@google.com", "time": "Mon Jul 01 04:27:30 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 01 04:27:30 2024 +0000" }, "message": "[DO NOT MERGE] Add mcts tags am: 804d9d2733 am: 612e42d525 am: 0636adafc4\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/3148419\n\nChange-Id: If7b31ff228fd0a435a31f1ba6cdc9558f0fe1d06\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "91d8ded1f69f7f97f59c1bd3af72efc5ef8f383f", "tree": "07c883ce993a591f0f2590f7a4814c5aab7decca", "parents": [ "d4f0bb72cc20c5be2ef2ce7de029167a40f413df", "92446d95203e603dad783d8fd342132d254e4735" ], "author": { "name": "Tongbo Liu", "email": "liutongbo@google.com", "time": "Mon Jul 01 04:27:17 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 01 04:27:17 2024 +0000" }, "message": "[automerger skipped] [DO NOT MERGE] Add mcts tags am: 804d9d2733 -s ours am: fcb0170d4a -s ours am: 92446d9520 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/3148419\n\nChange-Id: I09bb5d1ee17490c39fe840bdf6c5dad55d4590ea\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0636adafc42735af2ddb694c982b5884cffd88c8", "tree": "ec8bf44d828f80cc7089c6de0e464e367b418200", "parents": [ "e4d850d6ea92811a946ac7638f928dbbfc1561e9", "612e42d525ead00e82b7e52df2325a79034e34a0" ], "author": { "name": "Tongbo Liu", "email": "liutongbo@google.com", "time": "Mon Jul 01 04:17:08 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 01 04:17:08 2024 +0000" }, "message": "[DO NOT MERGE] Add mcts tags am: 804d9d2733 am: 612e42d525\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/3148419\n\nChange-Id: Iacf4a82b2c6a5e27da54736b9984d4c6c3fb71f2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "92446d95203e603dad783d8fd342132d254e4735", "tree": "07c883ce993a591f0f2590f7a4814c5aab7decca", "parents": [ "d17531a848863c8bb9c6c88531122044583a1fec", "fcb0170d4a02c4440d2e93ebba89580b6af9c050" ], "author": { "name": "Tongbo Liu", "email": "liutongbo@google.com", "time": "Mon Jul 01 04:11:30 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 01 04:11:30 2024 +0000" }, "message": "[automerger skipped] [DO NOT MERGE] Add mcts tags am: 804d9d2733 -s ours am: fcb0170d4a -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/3148419\n\nChange-Id: Id2105454b8a54baaaaf2f37ca12307647dd50912\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "612e42d525ead00e82b7e52df2325a79034e34a0", "tree": "ec8bf44d828f80cc7089c6de0e464e367b418200", "parents": [ "452d3e94a1a164b8bea5c733589ebb6edb3ccc1a", "804d9d2733d906ec9389397748fb2083537b265b" ], "author": { "name": "Tongbo Liu", "email": "liutongbo@google.com", "time": "Mon Jul 01 03:59:09 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 01 03:59:09 2024 +0000" }, "message": "[DO NOT MERGE] Add mcts tags am: 804d9d2733\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/3148419\n\nChange-Id: I919fa67580f33e7602143fe916223edf75ba1cb6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fcb0170d4a02c4440d2e93ebba89580b6af9c050", "tree": "22dfd15939f20dff56984fce92c32503430f31a7", "parents": [ "f9dec3e93ea8aec7d2134ff3aad0f20f0f9cb80e", "804d9d2733d906ec9389397748fb2083537b265b" ], "author": { "name": "Tongbo Liu", "email": "liutongbo@google.com", "time": "Mon Jul 01 03:52:27 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 01 03:52:27 2024 +0000" }, "message": "[automerger skipped] [DO NOT MERGE] Add mcts tags am: 804d9d2733 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/3148419\n\nChange-Id: I32cf13eb910919eed02299990920219610931dd6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "804d9d2733d906ec9389397748fb2083537b265b", "tree": "ec8bf44d828f80cc7089c6de0e464e367b418200", "parents": [ "00f142ef4310db592d78ee34aaa01647fa0e5108" ], "author": { "name": "Tongbo Liu", "email": "liutongbo@google.com", "time": "Thu Jun 27 10:17:16 2024 +0000" }, "committer": { "name": "Tongbo Liu", "email": "liutongbo@google.com", "time": "Thu Jun 27 11:30:10 2024 +0000" }, "message": "[DO NOT MERGE] Add mcts tags\n\nChange-Id: Icdeb6978b5f2ac4da0ab4107bf491bea215622b0\nTest: N/A\nBug: 348121429\n" }, { "commit": "d4f0bb72cc20c5be2ef2ce7de029167a40f413df", "tree": "07c883ce993a591f0f2590f7a4814c5aab7decca", "parents": [ "373fa9727480722e3b63938447b4b90982bbb7df", "d17531a848863c8bb9c6c88531122044583a1fec" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 20 21:46:12 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 20 21:46:12 2024 +0000" }, "message": "[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: d17531a848 -s ours\n\nam skip reason: Merged-In I493ffe5703e340fabfa27080eacf63fe16655946 with SHA-1 420fc1a203 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/27908888\n\nChange-Id: I4c8d1ae4a052e3542241cbf6d9077f68449a9027\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d17531a848863c8bb9c6c88531122044583a1fec", "tree": "07c883ce993a591f0f2590f7a4814c5aab7decca", "parents": [ "6005da8cc9a3b45ed7b03da8c432f89f16fcae77", "649e8ee82e1d19a812965733d049bdca7a4bcefd" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 14:13:47 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 14:13:47 2024 -0700" }, "message": "Merge 24Q3 (ab/11976889) to aosp-main-future\n\nBug: 347831320\nMerged-In: I493ffe5703e340fabfa27080eacf63fe16655946\nChange-Id: Ibbccda3a6155f59fd506fa66c5f0cbea737a0eb9\n" }, { "commit": "373fa9727480722e3b63938447b4b90982bbb7df", "tree": "07c883ce993a591f0f2590f7a4814c5aab7decca", "parents": [ "649e8ee82e1d19a812965733d049bdca7a4bcefd", "6005da8cc9a3b45ed7b03da8c432f89f16fcae77" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 05:55:38 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 18 05:55:38 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR3 to AOSP main am: f9dec3e93e -s ours am: 6005da8cc9 -s ours\n\nam skip reason: Merged-In I5a7269f49794c973bd805b830955f1aa02b21681 with SHA-1 6e5653b5d6 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/3131546\n\nChange-Id: I52e501ad65835bd89073b6e41c820cc73ff99f54\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6005da8cc9a3b45ed7b03da8c432f89f16fcae77", "tree": "22dfd15939f20dff56984fce92c32503430f31a7", "parents": [ "6e5653b5d6f342ef1f9d20fd5aa4ce2fe4a658ae", "f9dec3e93ea8aec7d2134ff3aad0f20f0f9cb80e" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jun 17 20:41:58 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 17 20:41:58 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR3 to AOSP main am: f9dec3e93e -s ours\n\nam skip reason: Merged-In I5a7269f49794c973bd805b830955f1aa02b21681 with SHA-1 6e5653b5d6 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/3131546\n\nChange-Id: I1a7d9178cded75a3e5c376780d7a2d7a4ebdc3bd\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f9dec3e93ea8aec7d2134ff3aad0f20f0f9cb80e", "tree": "22dfd15939f20dff56984fce92c32503430f31a7", "parents": [ "df5d3715cca622d5344fd9ad85e3aa40f4927c04", "6e5653b5d6f342ef1f9d20fd5aa4ce2fe4a658ae" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 13 10:50:37 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 13 10:50:37 2024 -0700" }, "message": "Merge Android 14 QPR3 to AOSP main\n\nBug: 346855327\nMerged-In: I5a7269f49794c973bd805b830955f1aa02b21681\nChange-Id: I883d3883773d169f95312ddeb9e703016a78625f\n" }, { "commit": "649e8ee82e1d19a812965733d049bdca7a4bcefd", "tree": "07c883ce993a591f0f2590f7a4814c5aab7decca", "parents": [ "1dbda35c9a5bb6aee3a5b0ea6a30be9a82258f86", "420fc1a203f21276738810344805a9b1d096ae90" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Sat Jun 08 03:30:52 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Jun 08 03:30:52 2024 +0000" }, "message": "Merge \"Add proposed trendy teams for CTS modules\" into main" }, { "commit": "420fc1a203f21276738810344805a9b1d096ae90", "tree": "89d80eeb5ffbd11adfb768259423e854e8737e34", "parents": [ "4ad0ac782a04d99ce4f2fcd013a132c10d1a8daf" ], "author": { "name": "Yihan Dong", "email": "slotus@google.com", "time": "Tue Jun 04 09:59:38 2024 +0000" }, "committer": { "name": "Yihan Dong", "email": "slotus@google.com", "time": "Thu Jun 06 01:52:10 2024 +0000" }, "message": "Add proposed trendy teams for CTS modules\n\nChange-Id: I493ffe5703e340fabfa27080eacf63fe16655946\nTest: build locally\nBug: 341598672\n" }, { "commit": "1dbda35c9a5bb6aee3a5b0ea6a30be9a82258f86", "tree": "90172f4ce92d3e0386fa8376050e3a55d827f30b", "parents": [ "4ad0ac782a04d99ce4f2fcd013a132c10d1a8daf" ], "author": { "name": "Veena Arvind", "email": "aveena@google.com", "time": "Wed Jun 05 19:02:58 2024 +0000" }, "committer": { "name": "Veena Arvind", "email": "aveena@google.com", "time": "Wed Jun 05 19:16:55 2024 +0000" }, "message": "Add READ_DEVICE_CONFIG permission\n\nBug: 340388480\nChange-Id: I02a58adb17cd85c956c353c320a511d9c32b67f4\n" }, { "commit": "4ad0ac782a04d99ce4f2fcd013a132c10d1a8daf", "tree": "0b34d44512f5531988a458ff7b7b52c023421a34", "parents": [ "47ac0c38ca03c36a7490c241e6a27d969a17bc92" ], "author": { "name": "Veena Arvind", "email": "aveena@google.com", "time": "Thu May 23 18:00:23 2024 +0000" }, "committer": { "name": "Veena Arvind", "email": "aveena@google.com", "time": "Thu May 23 18:34:56 2024 +0000" }, "message": "Check for property before calling onPropertiesChangedListener.\n\nSince the listener only checks for changes in properties, tests will\nfail if the property is already set to the value we want.\n\nBug: 333555726\nTest: atest CtsRebootReadinessHostTestCases\n\nChange-Id: If0c8c8a14bfb9a23295f163cdeeb580497db8a74\n" }, { "commit": "47ac0c38ca03c36a7490c241e6a27d969a17bc92", "tree": "fd99d478a2887842e40cea10cb4b6d28d15fe7e3", "parents": [ "a0afb3f4b99fc829265430663c7b1052a58c10e5", "bcdbf094a87e0e422207293fd46ecee1a49cc356" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Sat May 11 00:06:19 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat May 11 00:06:19 2024 +0000" }, "message": "Merge \"Add waits after setting properties in setup\" into main" }, { "commit": "bcdbf094a87e0e422207293fd46ecee1a49cc356", "tree": "fd99d478a2887842e40cea10cb4b6d28d15fe7e3", "parents": [ "c88cf4d87ea5262d1a3129ea4817590551231651" ], "author": { "name": "Veena Arvind", "email": "aveena@google.com", "time": "Fri May 10 17:43:45 2024 +0000" }, "committer": { "name": "Veena Arvind", "email": "aveena@google.com", "time": "Fri May 10 22:46:00 2024 +0000" }, "message": "Add waits after setting properties in setup\n\nTest: atest CtsRebootReadinessTestCases\nChange-Id: Iae4b905bf4d99a4305efe5c85c6a5a7015cbc68f\n" }, { "commit": "a0afb3f4b99fc829265430663c7b1052a58c10e5", "tree": "9219b2360d9e43e1cfd19140fbbae18c760d614e", "parents": [ "c88cf4d87ea5262d1a3129ea4817590551231651", "6e5653b5d6f342ef1f9d20fd5aa4ce2fe4a658ae" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri May 10 05:27:39 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri May 10 05:27:39 2024 +0000" }, "message": "[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 6e5653b5d6 -s ours\n\nam skip reason: Merged-In I4022b86e58329e1d7182129563d859d87c43831d with SHA-1 a47e8c47fe is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/27274295\n\nChange-Id: I7d5c161ae3cbe207355a3e732335f48f37f96cf2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c88cf4d87ea5262d1a3129ea4817590551231651", "tree": "9219b2360d9e43e1cfd19140fbbae18c760d614e", "parents": [ "b7f4c2a7f8cbec41e039b79f9367deb1885c5fcc", "46c961a00e80fd609ebeb18992cdfe983d887581" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed May 08 21:56:01 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 08 21:56:01 2024 +0000" }, "message": "Merge \"Revert \"Remove cts tag of MainlineCTS Scheduling test modules.\"\" into main" }, { "commit": "46c961a00e80fd609ebeb18992cdfe983d887581", "tree": "22dfd15939f20dff56984fce92c32503430f31a7", "parents": [ "0d1ffc9377df17da3806fd7216e3a880983b87ab" ], "author": { "name": "Kun Niu", "email": "kunniu@google.com", "time": "Tue May 07 18:04:40 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 07 18:05:00 2024 +0000" }, "message": "Revert \"Remove cts tag of MainlineCTS Scheduling test modules.\"\n\nRevert submission 26968771-remove_cts_tag_for_mcts\n\nReason for revert: potentially missing test coverage \n\nReverted changes: /q/submissionid:26968771-remove_cts_tag_for_mcts\n\nChange-Id: Ia7d943471d87df1e37e4192161f594ac15cd8a35\n" }, { "commit": "b7f4c2a7f8cbec41e039b79f9367deb1885c5fcc", "tree": "56e12969e0936999aab2b0afa9e6dbddd4066b9e", "parents": [ "fa44a1c3a2c7f81249d2d6c1baf8a4a22120eca4" ], "author": { "name": "Veena Arvind", "email": "aveena@google.com", "time": "Mon May 06 22:02:32 2024 +0000" }, "committer": { "name": "Veena Arvind", "email": "aveena@google.com", "time": "Mon May 06 22:04:00 2024 +0000" }, "message": "Increase wait before invoking latch::countDown in RebootReadinessManagerTest\n\nBug: 338857199\nChange-Id: Id5c0a0a95e0f8ba82a465f0541a5b0614f1616b0\n" }, { "commit": "6e5653b5d6f342ef1f9d20fd5aa4ce2fe4a658ae", "tree": "22dfd15939f20dff56984fce92c32503430f31a7", "parents": [ "e7db3ae1d168d067edcb08f22b49fe0d9a24dee9", "991c6573e22784a2ca6da1a3a704703995d14695" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon May 06 12:09:34 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon May 06 12:09:34 2024 -0700" }, "message": "Merge Android 24Q2 Release (ab/11526283) to aosp-main-future\n\nBug: 337098550\nMerged-In: I4022b86e58329e1d7182129563d859d87c43831d\nChange-Id: I5a7269f49794c973bd805b830955f1aa02b21681\n" }, { "commit": "fa44a1c3a2c7f81249d2d6c1baf8a4a22120eca4", "tree": "466082d52e936f1b5e0227d927b3301b92798fd6", "parents": [ "a7cbe53c5e4eb598690eca420109176fe1076fee" ], "author": { "name": "Veena Arvind", "email": "aveena@google.com", "time": "Tue Apr 30 23:50:36 2024 +0000" }, "committer": { "name": "Veena Arvind", "email": "aveena@google.com", "time": "Thu May 02 00:20:51 2024 +0000" }, "message": "Remove sleeps from RebootReadinessManagerTest and replace with waits.\n\nThis should improve test pass rate.\n\nBug: 333555726\nTest: atest -c CtsRebootReadinessTestCases\nChange-Id: I106140186b545fb7d59e777aee9e710cbcb87266\n" }, { "commit": "a7cbe53c5e4eb598690eca420109176fe1076fee", "tree": "606bc11c62371886b2194dec0e2d631d246d9d01", "parents": [ "0d1ffc9377df17da3806fd7216e3a880983b87ab", "a0ef71aa9ba72883b97a2fb6aade6a10e546c0ff" ], "author": { "name": "Veena Arvind", "email": "aveena@google.com", "time": "Wed May 01 17:40:13 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 01 17:40:13 2024 +0000" }, "message": "Merge \"Change owners for reboot readiness\" into main" }, { "commit": "a0ef71aa9ba72883b97a2fb6aade6a10e546c0ff", "tree": "eb8e94c200fb259201bb9e1fe1d8f3a9095f2247", "parents": [ "991c6573e22784a2ca6da1a3a704703995d14695" ], "author": { "name": "Veena Arvind", "email": "aveena@google.com", "time": "Wed May 01 00:05:52 2024 +0000" }, "committer": { "name": "Veena Arvind", "email": "aveena@google.com", "time": "Wed May 01 00:08:07 2024 +0000" }, "message": "Change owners for reboot readiness\n\nTest: N/A\nChange-Id: Ibe845c51aa8fb5a5427a91612e5b7c88015610aa\n" }, { "commit": "0d1ffc9377df17da3806fd7216e3a880983b87ab", "tree": "b1f721d768d7b358c998b324e4b82dcbc78a6553", "parents": [ "825db015a4943aaa483c474ba61e44633cc013c1" ], "author": { "name": "Lucia Li", "email": "luciali@google.com", "time": "Tue Apr 16 17:41:37 2024 +0800" }, "committer": { "name": "Lucia Li", "email": "luciali@google.com", "time": "Tue Apr 16 17:41:37 2024 +0800" }, "message": "Remove cts tag of MainlineCTS Scheduling test modules.\n\nBug: 316436147\nTest: abtd\nChange-Id: Ie41520c4c6d85ddbda4f0ffa779267dbb928e8cb\n" }, { "commit": "825db015a4943aaa483c474ba61e44633cc013c1", "tree": "22dfd15939f20dff56984fce92c32503430f31a7", "parents": [ "991c6573e22784a2ca6da1a3a704703995d14695", "e7db3ae1d168d067edcb08f22b49fe0d9a24dee9" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Mar 07 10:46:31 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 07 10:46:31 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR2 to AOSP main am: df5d3715cc -s ours am: e7db3ae1d1 -s ours\n\nam skip reason: Merged-In I0a1b08ef09fc684f944e3ebc3a9f828a44c3abf3 with SHA-1 7ff8da758a is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2990886\n\nChange-Id: Id4e9965c527b0eaf04dbe67c92c7bf6f7c037c43\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e7db3ae1d168d067edcb08f22b49fe0d9a24dee9", "tree": "317eb0b4630f2eed212bf4a249ea11d91122f465", "parents": [ "7ff8da758a61cab8fb0f9b9d893da0726e606304", "df5d3715cca622d5344fd9ad85e3aa40f4927c04" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Mar 07 09:55:06 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 07 09:55:06 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR2 to AOSP main am: df5d3715cc -s ours\n\nam skip reason: Merged-In I0a1b08ef09fc684f944e3ebc3a9f828a44c3abf3 with SHA-1 7ff8da758a is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2990886\n\nChange-Id: I6cb603a07f2045ffe02565153fd22f0d34bdfd74\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "df5d3715cca622d5344fd9ad85e3aa40f4927c04", "tree": "317eb0b4630f2eed212bf4a249ea11d91122f465", "parents": [ "c33afcbe3f9efeb93896aaa81359899e611dbb40", "7ff8da758a61cab8fb0f9b9d893da0726e606304" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Mar 06 09:30:09 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Mar 06 09:30:09 2024 -0800" }, "message": "Merge Android 14 QPR2 to AOSP main\n\nBug: 319669529\nMerged-In: I0a1b08ef09fc684f944e3ebc3a9f828a44c3abf3\nChange-Id: Iea2516607518b5691571f7e967cf3cc3cf8e90e0\n" }, { "commit": "991c6573e22784a2ca6da1a3a704703995d14695", "tree": "22dfd15939f20dff56984fce92c32503430f31a7", "parents": [ "f59c79b8c6de303d4c9ca21e6a3e0c562093802d", "7ff8da758a61cab8fb0f9b9d893da0726e606304" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jan 31 02:03:23 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 31 02:03:23 2024 +0000" }, "message": "[automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: 7ff8da758a -s ours\n\nam skip reason: Merged-In I584409b57252e25143752c582d0c0674a91a9803 with SHA-1 b1a6a8f655 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/25973726\n\nChange-Id: Ia3c059ff4984eb12cc2e24300669e234f52c3c44\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7ff8da758a61cab8fb0f9b9d893da0726e606304", "tree": "317eb0b4630f2eed212bf4a249ea11d91122f465", "parents": [ "bdb5dc2e3320384981ee9284e045b8dbe8a4b0d5", "b1a6a8f65573bbb35c713a478fcccf6dd9125cdc" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jan 29 10:24:01 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jan 29 10:24:01 2024 -0800" }, "message": "Merge Android 24Q1 Release (ab/11220357)\n\nBug: 319669529\nMerged-In: I584409b57252e25143752c582d0c0674a91a9803\nChange-Id: I0a1b08ef09fc684f944e3ebc3a9f828a44c3abf3\n" }, { "commit": "f59c79b8c6de303d4c9ca21e6a3e0c562093802d", "tree": "22dfd15939f20dff56984fce92c32503430f31a7", "parents": [ "b1bba614f3844b3c2b1a27c2929d5ea2c892136f", "bdb5dc2e3320384981ee9284e045b8dbe8a4b0d5" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Jan 26 03:32:16 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 26 03:32:16 2024 +0000" }, "message": "Remove java_api_contribution modules from .bp files am: c33afcbe3f am: bdb5dc2e33\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2924368\n\nChange-Id: I1864048537a7917be046dc103ac834d1eb6f6c82\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bdb5dc2e3320384981ee9284e045b8dbe8a4b0d5", "tree": "c366e6ae0db7d109c7d14c3ec0543fe88ed1311d", "parents": [ "ea640462f60b9362d3e468efe64c67f421fcd08b", "c33afcbe3f9efeb93896aaa81359899e611dbb40" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Jan 26 02:50:55 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 26 02:50:55 2024 +0000" }, "message": "Remove java_api_contribution modules from .bp files am: c33afcbe3f\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2924368\n\nChange-Id: I98d32bcb5a3d0e7af40a14424df0630204991363\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c33afcbe3f9efeb93896aaa81359899e611dbb40", "tree": "c366e6ae0db7d109c7d14c3ec0543fe88ed1311d", "parents": [ "ea640462f60b9362d3e468efe64c67f421fcd08b" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Jan 25 01:15:34 2024 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Jan 25 01:15:34 2024 +0000" }, "message": "Remove java_api_contribution modules from .bp files\n\njava_api_contribution modules are dynamically generated from droidstubs\nmodules or java_sdk_library_import, and is not a user-facing module.\nDefining this module is a .bp file is a no-op.\n\nTest: m nothing\nBug: 322242515\nChange-Id: Ic681a801fcc0bc28f6dc01e11734594b562d2e7b\n" }, { "commit": "b1bba614f3844b3c2b1a27c2929d5ea2c892136f", "tree": "b3169c4fb7c567314ff764f130c3e250da3d8e59", "parents": [ "b1a6a8f65573bbb35c713a478fcccf6dd9125cdc", "a47e8c47feca17d73c467050bc53a16ceb29d26d" ], "author": { "name": "Tongbo Liu", "email": "liutongbo@google.com", "time": "Mon Dec 18 13:01:06 2023 +0000" }, "committer": { "name": "Tongbo Liu", "email": "liutongbo@google.com", "time": "Mon Dec 18 13:07:03 2023 +0000" }, "message": "[conflict] Add mcts tag to MainlineCTS scheduling test modules. am: a47e8c47fe\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/25689576\n\nChange-Id: I07acdb9bbdb4696afa9eaa96faf32b1385920f97\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a47e8c47feca17d73c467050bc53a16ceb29d26d", "tree": "004f2ef67e615de18b08592d07bf97cfb8e92006", "parents": [ "ee45d1df4838ce75f0c881089168a223621013e1" ], "author": { "name": "Tongbo Liu", "email": "liutongbo@google.com", "time": "Mon Dec 18 10:14:11 2023 +0000" }, "committer": { "name": "Tongbo Liu", "email": "liutongbo@google.com", "time": "Mon Dec 18 10:23:11 2023 +0000" }, "message": "Add mcts tag to MainlineCTS scheduling test modules.\nBug: 316436957\n\nChange-Id: I4022b86e58329e1d7182129563d859d87c43831d\n" }, { "commit": "b1a6a8f65573bbb35c713a478fcccf6dd9125cdc", "tree": "8e29ff3e665406917c1f0d856b235bb931c77758", "parents": [ "9e76a89f40b1864186c8d75d1a40c312336efae9" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Oct 25 15:39:49 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Nov 06 10:16:42 2023 +0000" }, "message": "Baseline issues that were previously suppressed\n\njava_sdk_library has previously internally disabled a few legitimate\nissues. As this is being un-done for modules, add baselines for the\npre-existing issues.\n\nBug: 306806877\nTest: m checkapi\nChange-Id: I584409b57252e25143752c582d0c0674a91a9803\n" }, { "commit": "9e76a89f40b1864186c8d75d1a40c312336efae9", "tree": "c978d1127859f37e1e2cd006fdca99a03712a6f0", "parents": [ "4bacb5db7d1e7ef13194afcb683cc16b23566f5d", "91c3e28e8ef97dd3602ae3d824f7537c5f6936ab" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 26 22:17:23 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 26 22:17:23 2023 +0000" }, "message": "Merge changes from topic \"am-87ccba4480374e9fb46f4c8d8e3052f7\" into udc-qpr-dev-plus-aosp am: 91c3e28e8e -s ours\n\nam skip reason: Merged-In I83eccf007baba511b15fbde9327d3459d62adb51 with SHA-1 00f142ef43 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2781855\n\nChange-Id: Idca4fc9721ea751b976e68e53ca90e2e87665374\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4bacb5db7d1e7ef13194afcb683cc16b23566f5d", "tree": "c978d1127859f37e1e2cd006fdca99a03712a6f0", "parents": [ "82b02f82556555c9ad579dfb06b3dfbd9d284f03", "043b52c5d087d76bc10f7752837e05d687687a2b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 26 22:16:53 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 26 22:16:53 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge android14-tests-dev\" into main am: 0e2086c0da -s ours am: e4ad51eb2b -s ours am: 043b52c5d0 -s ours\n\nam skip reason: Merged-In I83eccf007baba511b15fbde9327d3459d62adb51 with SHA-1 00f142ef43 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2781855\n\nChange-Id: Ia7b0561ed020a0805dd88d1ea12940bd7019586a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "82b02f82556555c9ad579dfb06b3dfbd9d284f03", "tree": "c978d1127859f37e1e2cd006fdca99a03712a6f0", "parents": [ "ba42d7a82ed3db104d4298062ed2a0f03938db44", "76e0edc124d059c473213d4d0784b749a1277f8f" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 26 21:59:49 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 26 21:59:49 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge android14-tests-dev\" into main am: 0e2086c0da -s ours am: ea640462f6 -s ours am: 76e0edc124 -s ours\n\nam skip reason: Merged-In I83eccf007baba511b15fbde9327d3459d62adb51 with SHA-1 00f142ef43 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2781855\n\nChange-Id: Ifff2fd8f8e56b2ed53290ce97a1248f5fd51054e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ba42d7a82ed3db104d4298062ed2a0f03938db44", "tree": "c978d1127859f37e1e2cd006fdca99a03712a6f0", "parents": [ "baf4eeb572097db13f9945d3ee96eb9fbf772819", "d22dfe41506d3aa8ebe0575ef107feca12abede7" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 26 21:59:27 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 26 21:59:27 2023 +0000" }, "message": "[automerger skipped] Merge android14-tests-dev am: efd2ff501f -s ours am: bb1efebca1 -s ours am: d22dfe4150 -s ours\n\nam skip reason: Merged-In I83eccf007baba511b15fbde9327d3459d62adb51 with SHA-1 00f142ef43 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2781855\n\nChange-Id: I16b424f94a9112d67d9910fa258f85cf1b4f1bc6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "91c3e28e8ef97dd3602ae3d824f7537c5f6936ab", "tree": "c978d1127859f37e1e2cd006fdca99a03712a6f0", "parents": [ "76e0edc124d059c473213d4d0784b749a1277f8f", "043b52c5d087d76bc10f7752837e05d687687a2b" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 26 21:28:56 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 26 21:28:56 2023 +0000" }, "message": "Merge changes from topic \"am-87ccba4480374e9fb46f4c8d8e3052f7\" into udc-qpr-dev-plus-aosp\n\n* changes:\n [automerger skipped] Merge \"Merge android14-tests-dev\" into main am: 0e2086c0da -s ours am: e4ad51eb2b -s ours\n [automerger skipped] Merge android14-tests-dev am: efd2ff501f -s ours am: fbeaa38f7e -s ours\n" }, { "commit": "043b52c5d087d76bc10f7752837e05d687687a2b", "tree": "c978d1127859f37e1e2cd006fdca99a03712a6f0", "parents": [ "9e2e7962aef53b83df49b081bf4559bac0ffd5ab", "e4ad51eb2b15c16e22dacad24431446f163ff1df" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 26 21:26:20 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 26 21:26:20 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge android14-tests-dev\" into main am: 0e2086c0da -s ours am: e4ad51eb2b -s ours\n\nam skip reason: Merged-In I83eccf007baba511b15fbde9327d3459d62adb51 with SHA-1 00f142ef43 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2781855\n\nChange-Id: I461010952bb6b972db82efa385d5a3795163d697\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9e2e7962aef53b83df49b081bf4559bac0ffd5ab", "tree": "c978d1127859f37e1e2cd006fdca99a03712a6f0", "parents": [ "d64b4a29c22d6ac35b3aa19c42917bd624dad727", "fbeaa38f7eb2a70fa2d2a3c0b03d9980a70c2c62" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 26 21:25:55 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 26 21:25:55 2023 +0000" }, "message": "[automerger skipped] Merge android14-tests-dev am: efd2ff501f -s ours am: fbeaa38f7e -s ours\n\nam skip reason: Merged-In I83eccf007baba511b15fbde9327d3459d62adb51 with SHA-1 00f142ef43 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2781855\n\nChange-Id: I98022bd207c8c3bf7e193c8bdd1ab7c1765e2c45\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "76e0edc124d059c473213d4d0784b749a1277f8f", "tree": "c978d1127859f37e1e2cd006fdca99a03712a6f0", "parents": [ "d22dfe41506d3aa8ebe0575ef107feca12abede7", "ea640462f60b9362d3e468efe64c67f421fcd08b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 26 21:24:44 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 26 21:24:44 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge android14-tests-dev\" into main am: 0e2086c0da -s ours am: ea640462f6 -s ours\n\nam skip reason: Merged-In I83eccf007baba511b15fbde9327d3459d62adb51 with SHA-1 00f142ef43 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2781855\n\nChange-Id: I22292bf9a02ffa220941fc3b68e1b852dd88e9aa\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d22dfe41506d3aa8ebe0575ef107feca12abede7", "tree": "c978d1127859f37e1e2cd006fdca99a03712a6f0", "parents": [ "d64b4a29c22d6ac35b3aa19c42917bd624dad727", "bb1efebca14815339bc1729036cb3a57511d8d48" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 26 21:24:21 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 26 21:24:21 2023 +0000" }, "message": "[automerger skipped] Merge android14-tests-dev am: efd2ff501f -s ours am: bb1efebca1 -s ours\n\nam skip reason: Merged-In I83eccf007baba511b15fbde9327d3459d62adb51 with SHA-1 00f142ef43 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2781855\n\nChange-Id: I4aea200e4b52b01887ade1fcec9f954b27413c49\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e4ad51eb2b15c16e22dacad24431446f163ff1df", "tree": "c978d1127859f37e1e2cd006fdca99a03712a6f0", "parents": [ "fbeaa38f7eb2a70fa2d2a3c0b03d9980a70c2c62", "0e2086c0da896496860693deee4b3beda18fb870" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 26 20:51:31 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 26 20:51:31 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge android14-tests-dev\" into main am: 0e2086c0da -s ours\n\nam skip reason: Merged-In I83eccf007baba511b15fbde9327d3459d62adb51 with SHA-1 00f142ef43 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2781855\n\nChange-Id: I4d080f09966cebfe87a72abd8d0c6ab22427cfd9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fbeaa38f7eb2a70fa2d2a3c0b03d9980a70c2c62", "tree": "c978d1127859f37e1e2cd006fdca99a03712a6f0", "parents": [ "d3fbc0b54be7de5d590ff2418a4061ac88ec0309", "efd2ff501fa5bf2c74c0ffe7332961fea3f32a14" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 26 20:51:05 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 26 20:51:05 2023 +0000" }, "message": "[automerger skipped] Merge android14-tests-dev am: efd2ff501f -s ours\n\nam skip reason: Merged-In I83eccf007baba511b15fbde9327d3459d62adb51 with SHA-1 00f142ef43 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2781855\n\nChange-Id: I6391775042316893c476c5b6ca4a164be7efb232\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ea640462f60b9362d3e468efe64c67f421fcd08b", "tree": "c978d1127859f37e1e2cd006fdca99a03712a6f0", "parents": [ "bb1efebca14815339bc1729036cb3a57511d8d48", "0e2086c0da896496860693deee4b3beda18fb870" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 26 20:49:19 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 26 20:49:19 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge android14-tests-dev\" into main am: 0e2086c0da -s ours\n\nam skip reason: Merged-In I83eccf007baba511b15fbde9327d3459d62adb51 with SHA-1 00f142ef43 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2781855\n\nChange-Id: Id043c5437fc99c56ce3b4441ec7b10189870f160\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bb1efebca14815339bc1729036cb3a57511d8d48", "tree": "c978d1127859f37e1e2cd006fdca99a03712a6f0", "parents": [ "4e7c7456773e157192b7186c13f1f3c81d0082a2", "efd2ff501fa5bf2c74c0ffe7332961fea3f32a14" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 26 20:49:00 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 26 20:49:00 2023 +0000" }, "message": "[automerger skipped] Merge android14-tests-dev am: efd2ff501f -s ours\n\nam skip reason: Merged-In I83eccf007baba511b15fbde9327d3459d62adb51 with SHA-1 00f142ef43 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2781855\n\nChange-Id: I610365e41a030a29c53004d3fd8a3140553dbd01\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0e2086c0da896496860693deee4b3beda18fb870", "tree": "c978d1127859f37e1e2cd006fdca99a03712a6f0", "parents": [ "6dd0b6252fda87d59ffb772e921276b45a896670", "efd2ff501fa5bf2c74c0ffe7332961fea3f32a14" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 26 20:11:40 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Oct 26 20:11:40 2023 +0000" }, "message": "Merge \"Merge android14-tests-dev\" into main" }, { "commit": "efd2ff501fa5bf2c74c0ffe7332961fea3f32a14", "tree": "ed722aa1699983c8bb291d9f2aff8af8aa6dc094", "parents": [ "9788a129b3fefbffcb51e552b36954245a695ee0", "00f142ef4310db592d78ee34aaa01647fa0e5108" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Oct 10 16:07:48 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 26 10:27:53 2023 -0700" }, "message": "Merge android14-tests-dev\n\nBug: 263910020\nMerged-In: I83eccf007baba511b15fbde9327d3459d62adb51\nChange-Id: I89303af3e5f49c14d903940124a7e898d8bbb7ae\n" }, { "commit": "baf4eeb572097db13f9945d3ee96eb9fbf772819", "tree": "c978d1127859f37e1e2cd006fdca99a03712a6f0", "parents": [ "2db0ba8dcb94db97540147f37b3a7f39a7488988", "d64b4a29c22d6ac35b3aa19c42917bd624dad727" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 19 23:54:38 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 19 23:54:38 2023 +0000" }, "message": "[automerger skipped] Merge 10952656 am: 4e7c745677 -s ours am: d64b4a29c2 -s ours\n\nam skip reason: Merged-In I5746bf6c93d86945fe714e75a2271b346abe4923 with SHA-1 e711662222 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/25093280\n\nChange-Id: I91bdae285dc8dd0b7491b3efc856506bdab6a289\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d64b4a29c22d6ac35b3aa19c42917bd624dad727", "tree": "c978d1127859f37e1e2cd006fdca99a03712a6f0", "parents": [ "e711662222b07786f2846275eaac62119bd7bd06", "4e7c7456773e157192b7186c13f1f3c81d0082a2" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 19 18:47:52 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 19 18:47:52 2023 +0000" }, "message": "[automerger skipped] Merge 10952656 am: 4e7c745677 -s ours\n\nam skip reason: Merged-In I5746bf6c93d86945fe714e75a2271b346abe4923 with SHA-1 e711662222 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/25093280\n\nChange-Id: I0394dad587925e3a1753059af71e599d8d9bbe7d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4e7c7456773e157192b7186c13f1f3c81d0082a2", "tree": "c978d1127859f37e1e2cd006fdca99a03712a6f0", "parents": [ "d554c9cffb2948a9476c82eaaa793aa140e7fcb5", "e711662222b07786f2846275eaac62119bd7bd06" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Oct 17 10:08:57 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Oct 17 10:08:57 2023 -0700" }, "message": "Merge 10952656\n\nMerged-In: I5746bf6c93d86945fe714e75a2271b346abe4923\nChange-Id: I30e90978c3988d6e365af8ba8b27be59ac581b6d\n" }, { "commit": "2db0ba8dcb94db97540147f37b3a7f39a7488988", "tree": "c978d1127859f37e1e2cd006fdca99a03712a6f0", "parents": [ "15a2ef7fb76d364ed95fcfbf83c8f28123844538", "e711662222b07786f2846275eaac62119bd7bd06" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Oct 12 18:56:48 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 12 18:56:48 2023 +0000" }, "message": "Add additional overriding methods to signature files am: 6dd0b6252f am: d554c9cffb am: d3fbc0b54b am: 4dbbc0e2a3 am: e711662222\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2780207\n\nChange-Id: I2d0239d01a47b9368f3fdb29aa6d31a02371b68e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e711662222b07786f2846275eaac62119bd7bd06", "tree": "c978d1127859f37e1e2cd006fdca99a03712a6f0", "parents": [ "f95d1a331bbc075fd5c10f54cf25d8188f7890ea", "4dbbc0e2a300daf53d42b1c29424fc673e92053e" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Oct 12 18:39:30 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 12 18:39:30 2023 +0000" }, "message": "Add additional overriding methods to signature files am: 6dd0b6252f am: d554c9cffb am: d3fbc0b54b am: 4dbbc0e2a3\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2780207\n\nChange-Id: I5746bf6c93d86945fe714e75a2271b346abe4923\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4dbbc0e2a300daf53d42b1c29424fc673e92053e", "tree": "c978d1127859f37e1e2cd006fdca99a03712a6f0", "parents": [ "cda13b43f8b3e2b399b985b0b6b9056f9877891d", "d3fbc0b54be7de5d590ff2418a4061ac88ec0309" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Oct 12 18:06:52 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 12 18:06:52 2023 +0000" }, "message": "Add additional overriding methods to signature files am: 6dd0b6252f am: d554c9cffb am: d3fbc0b54b\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2780207\n\nChange-Id: I352c72ae15a6d7749285407b705c2a3828851fc8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d3fbc0b54be7de5d590ff2418a4061ac88ec0309", "tree": "c978d1127859f37e1e2cd006fdca99a03712a6f0", "parents": [ "41ca9dae764539b3011eb36c73065787029486bd", "d554c9cffb2948a9476c82eaaa793aa140e7fcb5" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Oct 12 17:33:34 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 12 17:33:34 2023 +0000" }, "message": "Add additional overriding methods to signature files am: 6dd0b6252f am: d554c9cffb\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2780207\n\nChange-Id: I7d8ef21fc4c596cd690b1d773d25f9efe9d9a86d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d554c9cffb2948a9476c82eaaa793aa140e7fcb5", "tree": "584e20af07ab5b0f6eebb92971b2cedf7b683685", "parents": [ "13bfc55c82483966f18a6a2d5d63e31fd4532c8a", "6dd0b6252fda87d59ffb772e921276b45a896670" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Oct 12 16:56:05 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 12 16:56:05 2023 +0000" }, "message": "Add additional overriding methods to signature files am: 6dd0b6252f\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2780207\n\nChange-Id: I1f075102eae5be8b1c0c9bc5a17f8b8c9ebb9e64\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6dd0b6252fda87d59ffb772e921276b45a896670", "tree": "584e20af07ab5b0f6eebb92971b2cedf7b683685", "parents": [ "a1ad79b15017899c7d420f048ee7dd3478f1d0d8" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Oct 12 01:21:00 2023 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Oct 12 01:21:00 2023 +0000" }, "message": "Add additional overriding methods to signature files\n\nThis change adds overriding methods that are essential to compile the\nstubs generated from the signature files.\n\nMore information and the background for this change is available at go/add-overriding-one-pager.\n\nTest: m checkbuild --build-from-text-stub\nBug: 299366704\nChange-Id: Ic63569612c348126478bebdbab673f903ed4dd89\n" }, { "commit": "15a2ef7fb76d364ed95fcfbf83c8f28123844538", "tree": "f44998af6580e77a398e41385d079484753c0973", "parents": [ "d8c14ef4cddba9e9e35ccecea76cc5edde511c46", "f95d1a331bbc075fd5c10f54cf25d8188f7890ea" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Thu Oct 12 00:07:46 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 12 00:07:46 2023 +0000" }, "message": "Prepare for keeping concrete overrides of abstract methods am: a1ad79b150 am: 13bfc55c82 am: 41ca9dae76 am: cda13b43f8 am: f95d1a331b\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2781648\n\nChange-Id: I900bcb53e6df9ca2eb8bc40e4146f857203c4815\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f95d1a331bbc075fd5c10f54cf25d8188f7890ea", "tree": "f44998af6580e77a398e41385d079484753c0973", "parents": [ "0da4842cab6587cbeff6ad2f9bf211ab2d49ade9", "cda13b43f8b3e2b399b985b0b6b9056f9877891d" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Wed Oct 11 22:32:32 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 11 22:32:32 2023 +0000" }, "message": "Prepare for keeping concrete overrides of abstract methods am: a1ad79b150 am: 13bfc55c82 am: 41ca9dae76 am: cda13b43f8\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2781648\n\nChange-Id: I2e93d734115a49adecbe927bb6f889b370a88d4a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cda13b43f8b3e2b399b985b0b6b9056f9877891d", "tree": "f44998af6580e77a398e41385d079484753c0973", "parents": [ "50b3ac94d50d3134be6311832de124476a7097d7", "41ca9dae764539b3011eb36c73065787029486bd" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Wed Oct 11 21:58:49 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 11 21:58:49 2023 +0000" }, "message": "Prepare for keeping concrete overrides of abstract methods am: a1ad79b150 am: 13bfc55c82 am: 41ca9dae76\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2781648\n\nChange-Id: If7e719f63a1c35cd5f96d5862106ca4377c49b56\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "41ca9dae764539b3011eb36c73065787029486bd", "tree": "f44998af6580e77a398e41385d079484753c0973", "parents": [ "59cc1954dec95142ca5c65a1c43e327951bce1b9", "13bfc55c82483966f18a6a2d5d63e31fd4532c8a" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Wed Oct 11 21:26:06 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 11 21:26:06 2023 +0000" }, "message": "Prepare for keeping concrete overrides of abstract methods am: a1ad79b150 am: 13bfc55c82\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2781648\n\nChange-Id: I114bb3e83f3c1d2c832963c16f59a99608f4a49a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "13bfc55c82483966f18a6a2d5d63e31fd4532c8a", "tree": "225ecc6a7965c84b995fdd903f00e379229b830a", "parents": [ "130d720c1a4eb2e3d68b7fc1212ceefb1590e81a", "a1ad79b15017899c7d420f048ee7dd3478f1d0d8" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Wed Oct 11 21:09:38 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 11 21:09:38 2023 +0000" }, "message": "Prepare for keeping concrete overrides of abstract methods am: a1ad79b150\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2781648\n\nChange-Id: I20a17301f64d2c6c9c0484566e890b0490c4337b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d8c14ef4cddba9e9e35ccecea76cc5edde511c46", "tree": "ed722aa1699983c8bb291d9f2aff8af8aa6dc094", "parents": [ "da7ea9f3ca00b632b10dd6de5b2336a6eb451e6f", "0da4842cab6587cbeff6ad2f9bf211ab2d49ade9" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Tue Oct 10 23:44:54 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 10 23:44:54 2023 +0000" }, "message": "Clean up obsolete aliases for Truth. am: 9788a129b3 am: 130d720c1a am: 59cc1954de am: 50b3ac94d5 am: 0da4842cab\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2777196\n\nChange-Id: Id7a3cd6f31d288d396ebbe6560391045f2791fed\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a1ad79b15017899c7d420f048ee7dd3478f1d0d8", "tree": "225ecc6a7965c84b995fdd903f00e379229b830a", "parents": [ "9788a129b3fefbffcb51e552b36954245a695ee0" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue Oct 10 17:51:56 2023 +0100" }, "committer": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue Oct 10 17:51:56 2023 +0100" }, "message": "Prepare for keeping concrete overrides of abstract methods\n\nCurrently, metalava will discard concrete overrides of abstract methods\nfrom the API signature files which causes problems when attempting to\ngenerate stubs from those files and also discards information that may\nbe important in API reviews. This change is the first step in the\nprocess of changing that behavior.\n\nThis change hard codes the current behavior for discarding the concrete\noverrides (`add-additional-overrides\u003dno`) into those signature files\nthat will (or are likely) to be affected by the change in behavior.\nThat allows the default behavior to be changed for all the other files\nwithout affecting these.\n\nFollow up changes will remove the hard coding from the signature files\nand will update the contents which will include the concrete overrides\nof the abstract methods.\n\nMore information and the background for this change is available at\ngo/add-overriding-one-pager.\n\nTest: m checkapi\nBug: 299366704\nChange-Id: I16cef4319b4a6331196a225c547f65e9baff185e\n" }, { "commit": "0da4842cab6587cbeff6ad2f9bf211ab2d49ade9", "tree": "ed722aa1699983c8bb291d9f2aff8af8aa6dc094", "parents": [ "31e059a8165310e9b165d42d6b4775f60580a97f", "50b3ac94d50d3134be6311832de124476a7097d7" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Tue Oct 10 01:41:38 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 10 01:41:38 2023 +0000" }, "message": "Clean up obsolete aliases for Truth. am: 9788a129b3 am: 130d720c1a am: 59cc1954de am: 50b3ac94d5\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2777196\n\nChange-Id: I25c8236702078d9c29c4799088727b3f0e6c317d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "50b3ac94d50d3134be6311832de124476a7097d7", "tree": "ed722aa1699983c8bb291d9f2aff8af8aa6dc094", "parents": [ "e0007dd7f9123bc745779db7a52239c14e43442d", "59cc1954dec95142ca5c65a1c43e327951bce1b9" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Tue Oct 10 01:32:07 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 10 01:32:07 2023 +0000" }, "message": "Clean up obsolete aliases for Truth. am: 9788a129b3 am: 130d720c1a am: 59cc1954de\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2777196\n\nChange-Id: Icb300f2d9f47afcb9ad37d9349d52f1d7b972da1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "59cc1954dec95142ca5c65a1c43e327951bce1b9", "tree": "ed722aa1699983c8bb291d9f2aff8af8aa6dc094", "parents": [ "1eee37acdc4354eb83a2ac9c74942cb04bd6f161", "130d720c1a4eb2e3d68b7fc1212ceefb1590e81a" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Tue Oct 10 00:16:24 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 10 00:16:24 2023 +0000" }, "message": "Clean up obsolete aliases for Truth. am: 9788a129b3 am: 130d720c1a\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2777196\n\nChange-Id: Ibe10cb5762f27dc31f72da4ed1d44618206bb769\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "130d720c1a4eb2e3d68b7fc1212ceefb1590e81a", "tree": "0f32121ba3e7d800750b93db908c64733e0e105a", "parents": [ "7e1369e7fcf65d9a5c5decdd754d5e796bc6329f", "9788a129b3fefbffcb51e552b36954245a695ee0" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Mon Oct 09 23:38:38 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 09 23:38:38 2023 +0000" }, "message": "Clean up obsolete aliases for Truth. am: 9788a129b3\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2777196\n\nChange-Id: Ic854db3d99792d08aa8c39e75d66950acacf13cc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9788a129b3fefbffcb51e552b36954245a695ee0", "tree": "0f32121ba3e7d800750b93db908c64733e0e105a", "parents": [ "7310e26eb5ba985dc79cc397e6cb9a538cd3bd9f" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Sat Oct 07 00:48:18 2023 +0000" }, "committer": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Sat Oct 07 00:48:18 2023 +0000" }, "message": "Clean up obsolete aliases for Truth.\n\nBug: 255714762\nTest: presubmit\nChange-Id: Ief34688726b659d1cc5839b5d1c87fa78c107785\n" } ], "next": "da7ea9f3ca00b632b10dd6de5b2336a6eb451e6f" }