)]}' { "log": [ { "commit": "4f4806c19731b2e0d1e51fb76f5c33be402e34fa", "tree": "dea71cd91a3309fa801ef6fe9e475fe2c2230861", "parents": [ "3ff81872dd771505ae446579ad46cd1fa54f7475", "c967392ee5516ee43e5cbe5851bd66c8e9d31a1a" ], "author": { "name": "Sadaf Ebrahimi", "email": "sadafebrahimi@google.com", "time": "Thu Dec 19 14:43:01 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 19 14:43:01 2024 -0800" }, "message": "Add janitors to the OWNERS file am: c967392ee5\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jsr330/+/3421146\n\nChange-Id: Iff23a179d1793c36ceba81f6d21ba8fb0e6ea0b0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c967392ee5516ee43e5cbe5851bd66c8e9d31a1a", "tree": "dea71cd91a3309fa801ef6fe9e475fe2c2230861", "parents": [ "3ff81872dd771505ae446579ad46cd1fa54f7475" ], "author": { "name": "Sadaf Ebrahimi", "email": "sadafebrahimi@google.com", "time": "Wed Dec 18 20:20:36 2024 +0000" }, "committer": { "name": "Sadaf Ebrahimi", "email": "sadafebrahimi@google.com", "time": "Wed Dec 18 20:20:36 2024 +0000" }, "message": "Add janitors to the OWNERS file\n\nTest: TreeHugger\nChange-Id: Ib667b7b41e883a588157e2c8716cb9890e4d2648\n" }, { "commit": "3ff81872dd771505ae446579ad46cd1fa54f7475", "tree": "15e6bcdd3943355d956909f00e60d7a06d0694cb", "parents": [ "770088bea666436d8c34092b3c30490f678cd6c9", "dfe5f95f7e877d93b6affd3c9d337e2afea1eb41" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 21:25:56 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 18 21:25:56 2024 +0000" }, "message": "[automerger skipped] Mark ab/11976889 as merged in aosp-main-future am: dfe5f95f7e -s ours\n\nam skip reason: Merged-In Ifc714004f81b984775421753e385984fc47c491b with SHA-1 d6ea3a3c89 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/27904580\n\nChange-Id: I194ad219f3009bb0d1244ee7ba6af74c4e4326e3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "dfe5f95f7e877d93b6affd3c9d337e2afea1eb41", "tree": "15e6bcdd3943355d956909f00e60d7a06d0694cb", "parents": [ "d6ea3a3c89b89dcdb70390ba6156f129a875a50e", "18dd9e448f7168a75a5b4619b79870893e40c47f" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 11:43:32 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 11:43:32 2024 -0700" }, "message": "Mark ab/11976889 as merged in aosp-main-future\n\nBug: 347831320\nMerged-In: Ifc714004f81b984775421753e385984fc47c491b\nChange-Id: I4db97daf570ee69dedd1de48e64047cec30e71b4\n" }, { "commit": "770088bea666436d8c34092b3c30490f678cd6c9", "tree": "15e6bcdd3943355d956909f00e60d7a06d0694cb", "parents": [ "18dd9e448f7168a75a5b4619b79870893e40c47f", "d6ea3a3c89b89dcdb70390ba6156f129a875a50e" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 05:55:14 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 18 05:55:14 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR3 to AOSP main am: 4b95de27fd -s ours am: d6ea3a3c89 -s ours\n\nam skip reason: Merged-In Icf10387b2fff523f8f5d8993b140c78d05cc38be with SHA-1 4662ad3f2b is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jsr330/+/3132314\n\nChange-Id: I8fb3e81b4c3b8bfb94dd1a6a49ce1c7d73fd10ba\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d6ea3a3c89b89dcdb70390ba6156f129a875a50e", "tree": "15e6bcdd3943355d956909f00e60d7a06d0694cb", "parents": [ "4662ad3f2bb6a597c3f910858e2f8d3547aa1665", "4b95de27fd6d0c058538fb3e202823b11ba313ef" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jun 17 20:41:10 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 17 20:41:10 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR3 to AOSP main am: 4b95de27fd -s ours\n\nam skip reason: Merged-In Icf10387b2fff523f8f5d8993b140c78d05cc38be with SHA-1 4662ad3f2b is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jsr330/+/3132314\n\nChange-Id: Ifc714004f81b984775421753e385984fc47c491b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4b95de27fd6d0c058538fb3e202823b11ba313ef", "tree": "15e6bcdd3943355d956909f00e60d7a06d0694cb", "parents": [ "ff0c45240e501c02eaae7d25cd6feaead22b8ee7", "4662ad3f2bb6a597c3f910858e2f8d3547aa1665" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 13 10:49:56 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 13 10:49:56 2024 -0700" }, "message": "Merge Android 14 QPR3 to AOSP main\n\nBug: 346855327\nMerged-In: Icf10387b2fff523f8f5d8993b140c78d05cc38be\nChange-Id: I098832d38c2093a9094ecd1675ac75c96bc44d25\n" }, { "commit": "18dd9e448f7168a75a5b4619b79870893e40c47f", "tree": "15e6bcdd3943355d956909f00e60d7a06d0694cb", "parents": [ "235c95129827c2d025ef60bf7579774b2dfb0713", "4662ad3f2bb6a597c3f910858e2f8d3547aa1665" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri May 10 02:16:52 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri May 10 02:16:52 2024 +0000" }, "message": "[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 4662ad3f2b -s ours\n\nam skip reason: Merged-In I3ea4598a19db32e78d21b5f3c942bdc92a375f99 with SHA-1 3b92ed367c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/27273863\n\nChange-Id: I03cd44fee45876773954485f2501102f3f1ebd64\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4662ad3f2bb6a597c3f910858e2f8d3547aa1665", "tree": "15e6bcdd3943355d956909f00e60d7a06d0694cb", "parents": [ "ff0c45240e501c02eaae7d25cd6feaead22b8ee7", "235c95129827c2d025ef60bf7579774b2dfb0713" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon May 06 12:09:19 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon May 06 12:09:19 2024 -0700" }, "message": "Merge Android 24Q2 Release (ab/11526283) to aosp-main-future\n\nBug: 337098550\nMerged-In: I3ea4598a19db32e78d21b5f3c942bdc92a375f99\nChange-Id: Icf10387b2fff523f8f5d8993b140c78d05cc38be\n" }, { "commit": "235c95129827c2d025ef60bf7579774b2dfb0713", "tree": "15e6bcdd3943355d956909f00e60d7a06d0694cb", "parents": [ "58df57fc3c399395bc1f1c4246844169c92ab6ce", "3b92ed367c52e1513b8791604c4c06919c0541d5" ], "author": { "name": "Tyler Saunders", "email": "tylersaunders@google.com", "time": "Mon Jan 22 15:57:17 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jan 22 15:57:17 2024 +0000" }, "message": "Fix array ordering. am: 3b92ed367c\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/25970774\n\nChange-Id: Iad9551c308340d639387e4e153708a3d9942460c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "58df57fc3c399395bc1f1c4246844169c92ab6ce", "tree": "da272ddad4b6887ddc0a90afda02d405fe5186f6", "parents": [ "ff0c45240e501c02eaae7d25cd6feaead22b8ee7", "958b120e41f31e753daea055a3c3030f7cadc247" ], "author": { "name": "Tyler Saunders", "email": "tylersaunders@google.com", "time": "Mon Jan 22 14:54:31 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jan 22 14:54:31 2024 +0000" }, "message": "Add mediaprovider in apex_available for jsr330 am: 958b120e41\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/25932274\n\nChange-Id: Icaa37851b6d8fd1a4aed99c4033697c1a7cffb51\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3b92ed367c52e1513b8791604c4c06919c0541d5", "tree": "15e6bcdd3943355d956909f00e60d7a06d0694cb", "parents": [ "958b120e41f31e753daea055a3c3030f7cadc247" ], "author": { "name": "Tyler Saunders", "email": "tylersaunders@google.com", "time": "Mon Jan 22 14:25:43 2024 +0000" }, "committer": { "name": "Tyler Saunders", "email": "tylersaunders@google.com", "time": "Mon Jan 22 14:25:43 2024 +0000" }, "message": "Fix array ordering.\n\nI missed the comment before hitting submit on another CL in the topic,\nso just cleaning this up after-the-fact.\n\nBug: n/a\nTest: n/a\nChange-Id: I3ea4598a19db32e78d21b5f3c942bdc92a375f99\n" }, { "commit": "958b120e41f31e753daea055a3c3030f7cadc247", "tree": "da272ddad4b6887ddc0a90afda02d405fe5186f6", "parents": [ "289689dc538c07e97ada96cd41349a7145e2091c" ], "author": { "name": "Tyler Saunders", "email": "tylersaunders@google.com", "time": "Thu Jan 18 08:54:37 2024 +0000" }, "committer": { "name": "Tyler Saunders", "email": "tylersaunders@google.com", "time": "Thu Jan 18 08:54:37 2024 +0000" }, "message": "Add mediaprovider in apex_available for jsr330\n\n(Requires for hilt_android dependency)\n\nTest: n/a\nBug: b/303779617\nChange-Id: I3f550e86ef434175de47b49c2d67bb3d88934194\n" }, { "commit": "ff0c45240e501c02eaae7d25cd6feaead22b8ee7", "tree": "cc98cb2ae47e22d126b081e707838231880d1cdf", "parents": [ "af91b235aa30794cd0524a848de4924b23561d4e", "48e237211e2ccb22799b1811b4e63d0d78221a46" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Oct 07 00:19:35 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Oct 07 00:19:35 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: ab50b9e997 -s ours am: aaf862bed1 -s ours am: fd1379affb -s ours am: 898aa90c07 -s ours am: 48e237211e -s ours\n\nam skip reason: Merged-In I19543d1bf29083d24609aae1b02e6235d0d78843 with SHA-1 b0915ceae9 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jsr330/+/2776020\n\nChange-Id: Ia9b2c1c63c3188bfe2cb360d305410e39d35d894\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "48e237211e2ccb22799b1811b4e63d0d78221a46", "tree": "cc98cb2ae47e22d126b081e707838231880d1cdf", "parents": [ "7f93f2a28454157a08e68109236c2d65a4fd6b2b", "898aa90c07f7cb5114c2eced91f4c1bd9d021a7d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 11:00:04 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 11:00:04 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: ab50b9e997 -s ours am: aaf862bed1 -s ours am: fd1379affb -s ours am: 898aa90c07 -s ours\n\nam skip reason: Merged-In I19543d1bf29083d24609aae1b02e6235d0d78843 with SHA-1 b0915ceae9 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jsr330/+/2776020\n\nChange-Id: I1c086e4d0ace50204ad5a39dac332cede4f0ed6d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "898aa90c07f7cb5114c2eced91f4c1bd9d021a7d", "tree": "cc98cb2ae47e22d126b081e707838231880d1cdf", "parents": [ "29f6a8d4cbe179b81062a1ae981eb232478d1ac2", "fd1379affbc034c972b94f6af8324a1761ca9631" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 09:50:14 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 09:50:14 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: ab50b9e997 -s ours am: aaf862bed1 -s ours am: fd1379affb -s ours\n\nam skip reason: Merged-In I19543d1bf29083d24609aae1b02e6235d0d78843 with SHA-1 b0915ceae9 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jsr330/+/2776020\n\nChange-Id: I092cf10db3d7c2e7913588a7a6fc61d82917f277\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fd1379affbc034c972b94f6af8324a1761ca9631", "tree": "cc98cb2ae47e22d126b081e707838231880d1cdf", "parents": [ "832fbe87e2afbf28aa39c979218fef06a809920e", "aaf862bed1f35d55a59b4fc7c852a0b762802fcd" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 08:58:32 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 08:58:32 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: ab50b9e997 -s ours am: aaf862bed1 -s ours\n\nam skip reason: Merged-In I19543d1bf29083d24609aae1b02e6235d0d78843 with SHA-1 b0915ceae9 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jsr330/+/2776020\n\nChange-Id: Ida8e8c4142de946ffd8a05510075c78535ab0fed\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "aaf862bed1f35d55a59b4fc7c852a0b762802fcd", "tree": "cc98cb2ae47e22d126b081e707838231880d1cdf", "parents": [ "7317e9aed2b7b28d3311060c70e2c7fa84ec4618", "ab50b9e9978bddab3298cfb6090b54b64369e912" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 07:51:33 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 07:51:33 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: ab50b9e997 -s ours\n\nam skip reason: Merged-In I19543d1bf29083d24609aae1b02e6235d0d78843 with SHA-1 b0915ceae9 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jsr330/+/2776020\n\nChange-Id: I31e504256635b327d3f85233844e5890da176383\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ab50b9e9978bddab3298cfb6090b54b64369e912", "tree": "cc98cb2ae47e22d126b081e707838231880d1cdf", "parents": [ "6cdab74e1b888eb02bd87a6e0170f960384f7a95", "7317e9aed2b7b28d3311060c70e2c7fa84ec4618" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 05 15:39:06 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 05 15:39:06 2023 -0700" }, "message": "Merge Android 14\n\nBug: 298295554\nMerged-In: I19543d1bf29083d24609aae1b02e6235d0d78843\nChange-Id: Iaaeafb8cbe0c1d7d454d99a50616bd57ca440991\n" }, { "commit": "af91b235aa30794cd0524a848de4924b23561d4e", "tree": "cc98cb2ae47e22d126b081e707838231880d1cdf", "parents": [ "683dc7f59be314f4d851e2949fda0d643efbb24b", "7f93f2a28454157a08e68109236c2d65a4fd6b2b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 20:37:31 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 20:37:31 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: 7317e9aed2 -s ours am: 832fbe87e2 -s ours am: 29f6a8d4cb -s ours am: 7f93f2a284 -s ours\n\nam skip reason: Merged-In If240d22844ce47df705295965261537d13bb4654 with SHA-1 07e40c436f is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/24182198\n\nChange-Id: Ib0ec07c6857e805140ab9ffc8e637d7555d24169\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7f93f2a28454157a08e68109236c2d65a4fd6b2b", "tree": "cc98cb2ae47e22d126b081e707838231880d1cdf", "parents": [ "07e40c436fe92aafcb79acff5d0d4333e5fa1dd5", "29f6a8d4cbe179b81062a1ae981eb232478d1ac2" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 01:10:25 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 01:10:25 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: 7317e9aed2 -s ours am: 832fbe87e2 -s ours am: 29f6a8d4cb -s ours\n\nam skip reason: Merged-In If240d22844ce47df705295965261537d13bb4654 with SHA-1 07e40c436f is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/24182198\n\nChange-Id: I14e501fe0eb187a8fd620c910c2afde698c3c8e4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "29f6a8d4cbe179b81062a1ae981eb232478d1ac2", "tree": "cc98cb2ae47e22d126b081e707838231880d1cdf", "parents": [ "07e40c436fe92aafcb79acff5d0d4333e5fa1dd5", "832fbe87e2afbf28aa39c979218fef06a809920e" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 00:34:41 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 00:34:41 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: 7317e9aed2 -s ours am: 832fbe87e2 -s ours\n\nam skip reason: Merged-In If240d22844ce47df705295965261537d13bb4654 with SHA-1 07e40c436f is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/24182198\n\nChange-Id: Ia151334c6e3e44105c90464d6e956494b0db4446\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "832fbe87e2afbf28aa39c979218fef06a809920e", "tree": "cc98cb2ae47e22d126b081e707838231880d1cdf", "parents": [ "07e40c436fe92aafcb79acff5d0d4333e5fa1dd5", "7317e9aed2b7b28d3311060c70e2c7fa84ec4618" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 28 23:58:42 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 28 23:58:42 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: 7317e9aed2 -s ours\n\nam skip reason: Merged-In If240d22844ce47df705295965261537d13bb4654 with SHA-1 07e40c436f is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/24182198\n\nChange-Id: I07ddbdf9ba065a0872945da882084cb0ca2461d3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7317e9aed2b7b28d3311060c70e2c7fa84ec4618", "tree": "cc98cb2ae47e22d126b081e707838231880d1cdf", "parents": [ "6cdab74e1b888eb02bd87a6e0170f960384f7a95", "07e40c436fe92aafcb79acff5d0d4333e5fa1dd5" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 14 15:37:49 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 14 15:37:49 2023 -0700" }, "message": "Merge Android U (ab/10368041)\n\nBug: 291102124\nMerged-In: If240d22844ce47df705295965261537d13bb4654\nChange-Id: I954262114db9a75706a32b950372806bda82dd03\n" }, { "commit": "683dc7f59be314f4d851e2949fda0d643efbb24b", "tree": "cc98cb2ae47e22d126b081e707838231880d1cdf", "parents": [ "0e4de5501e273054b668bfa44eba5e1ed2fc3113", "289689dc538c07e97ada96cd41349a7145e2091c" ], "author": { "name": "Neha Pattan", "email": "npattan@google.com", "time": "Sun Feb 19 04:42:42 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Feb 19 04:42:42 2023 +0000" }, "message": "[automerger skipped] (TM-MP) Rb back compat: Base changes (go/rbc-design) am: b0915ceae9 am: 07e40c436f am: 289689dc53 -s ours\n\nam skip reason: Merged-In Ia583fddcb88a21b5c739c7438c07967e7e581099 with SHA-1 103d5b5a62 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/21481657\n\nChange-Id: Icde6d757448c5597870f33c134f90dd5f3da36cf\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "289689dc538c07e97ada96cd41349a7145e2091c", "tree": "cc98cb2ae47e22d126b081e707838231880d1cdf", "parents": [ "be17cef94ae0d1ea64c527f40a5ec16df995c6db", "07e40c436fe92aafcb79acff5d0d4333e5fa1dd5" ], "author": { "name": "Neha Pattan", "email": "npattan@google.com", "time": "Sun Feb 19 03:36:45 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Feb 19 03:36:45 2023 +0000" }, "message": "(TM-MP) Rb back compat: Base changes (go/rbc-design) am: b0915ceae9 am: 07e40c436f\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/21481657\n\nChange-Id: I080b142b8cca57b12da00922818ea78b541d236e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0e4de5501e273054b668bfa44eba5e1ed2fc3113", "tree": "cc98cb2ae47e22d126b081e707838231880d1cdf", "parents": [ "103d5b5a62e514eeb102549ab9e32c6881fd8c6f", "07e40c436fe92aafcb79acff5d0d4333e5fa1dd5" ], "author": { "name": "Neha Pattan", "email": "npattan@google.com", "time": "Sun Feb 19 03:31:48 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Feb 19 03:31:48 2023 +0000" }, "message": "[automerger skipped] (TM-MP) Rb back compat: Base changes (go/rbc-design) am: b0915ceae9 am: 07e40c436f -s ours\n\nam skip reason: Merged-In Ia583fddcb88a21b5c739c7438c07967e7e581099 with SHA-1 103d5b5a62 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/21481657\n\nChange-Id: Ia6149e3d875f20fe8d1dc97ccd54d310e0b9f87e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "07e40c436fe92aafcb79acff5d0d4333e5fa1dd5", "tree": "cc98cb2ae47e22d126b081e707838231880d1cdf", "parents": [ "be17cef94ae0d1ea64c527f40a5ec16df995c6db", "b0915ceae9262d08d19fb370528e6aa602897519" ], "author": { "name": "Neha Pattan", "email": "npattan@google.com", "time": "Fri Feb 17 18:34:55 2023 +0000" }, "committer": { "name": "Neha Pattan", "email": "npattan@google.com", "time": "Fri Feb 17 22:06:41 2023 +0000" }, "message": "(TM-MP) Rb back compat: Base changes (go/rbc-design) am: b0915ceae9\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/21173774\n\nChange-Id: If240d22844ce47df705295965261537d13bb4654\nMerged-In: Ia583fddcb88a21b5c739c7438c07967e7e581099\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\nBug: 263816046\nIgnore-AOSP-First: Automerger fix\n" }, { "commit": "103d5b5a62e514eeb102549ab9e32c6881fd8c6f", "tree": "cc98cb2ae47e22d126b081e707838231880d1cdf", "parents": [ "be17cef94ae0d1ea64c527f40a5ec16df995c6db", "b0915ceae9262d08d19fb370528e6aa602897519" ], "author": { "name": "Neha Pattan", "email": "npattan@google.com", "time": "Fri Feb 17 00:56:48 2023 +0000" }, "committer": { "name": "Neha Pattan", "email": "npattan@google.com", "time": "Fri Feb 17 01:01:28 2023 +0000" }, "message": "(TM-MP) Rb back compat: Base changes (go/rbc-design) 2p: b0915ceae9\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/21173774\n\nBug: 263816046\nChange-Id: Ia583fddcb88a21b5c739c7438c07967e7e581099\n" }, { "commit": "b0915ceae9262d08d19fb370528e6aa602897519", "tree": "6956bbf5ea78f3cb61ab6eacde66c55d10724af8", "parents": [ "4c4aa4845644802f7357d6374c35240ddeb1db25" ], "author": { "name": "Neha Pattan", "email": "npattan@google.com", "time": "Tue Dec 27 23:38:43 2022 +0000" }, "committer": { "name": "Neha Pattan", "email": "npattan@google.com", "time": "Tue Feb 14 23:45:07 2023 +0000" }, "message": "(TM-MP) Rb back compat: Base changes (go/rbc-design)\n\nBug: 263816046\nTest: manual\nChange-Id: I19543d1bf29083d24609aae1b02e6235d0d78843\n" }, { "commit": "be17cef94ae0d1ea64c527f40a5ec16df995c6db", "tree": "63023a8664b05f4cd14027267291ad7ec92b8b82", "parents": [ "d3784652865cf05f2dc38654a62d7bd06dde203c" ], "author": { "name": "ronish", "email": "ronish@google.com", "time": "Tue Feb 07 18:12:34 2023 +0000" }, "committer": { "name": "ronish", "email": "ronish@google.com", "time": "Wed Feb 08 16:07:49 2023 +0000" }, "message": "Rename healthconnect to healthfitness\n\nBug: 264516143\nChange-Id: I4bc0fc62fc5cc8fb814dfa55a7809256e3f88792\n" }, { "commit": "d3784652865cf05f2dc38654a62d7bd06dde203c", "tree": "1b79395a273d32b33913ad7a32782fd17222fed4", "parents": [ "ca8ecd2da098bbbc166f7ef6399c8b8e891a4b17", "6cdab74e1b888eb02bd87a6e0170f960384f7a95" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Wed Oct 26 20:22:00 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 26 20:22:00 2022 +0000" }, "message": "Fix errorprone warnings that should be errors am: c9512961be am: ee43457366 am: 6cdab74e1b\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jsr330/+/2256802\n\nChange-Id: I094907ccfdedec285085a50d788d5a6cd2ea9877\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6cdab74e1b888eb02bd87a6e0170f960384f7a95", "tree": "1ce77d37aa3e5418c901028df5678a829c13993a", "parents": [ "1f5ea49133b47534c45012b858a488eaffc73ce5", "ee4345736647cf17fd96bc475cba50d6736f38b1" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Wed Oct 26 19:45:28 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 26 19:45:28 2022 +0000" }, "message": "Fix errorprone warnings that should be errors am: c9512961be am: ee43457366\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jsr330/+/2256802\n\nChange-Id: Ide319774ef2b8c006d3dae3986de3c551381fce4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ee4345736647cf17fd96bc475cba50d6736f38b1", "tree": "1ce77d37aa3e5418c901028df5678a829c13993a", "parents": [ "1f5ea49133b47534c45012b858a488eaffc73ce5", "c9512961be58f580800f483a4c6f60f4db2db715" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Wed Oct 26 19:12:12 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 26 19:12:12 2022 +0000" }, "message": "Fix errorprone warnings that should be errors am: c9512961be\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jsr330/+/2256802\n\nChange-Id: Id7ffa7cc8f3f53f485a297faaca73809a7a8d220\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c9512961be58f580800f483a4c6f60f4db2db715", "tree": "1ce77d37aa3e5418c901028df5678a829c13993a", "parents": [ "1f5ea49133b47534c45012b858a488eaffc73ce5" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Sat Oct 15 21:33:32 2022 -0700" }, "committer": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Sat Oct 15 21:33:32 2022 -0700" }, "message": "Fix errorprone warnings that should be errors\n\nThis commit is part of a large scale change to fix errorprone\nerrors that have been downgraded to warnings in the android\nsource tree, so that they can be promoted to errors again.\nThe full list of changes include the following, but not all\nwill be present in any one individual commit:\n\nBadAnnotationImplementation\nBadShiftAmount\nBanJNDI\nBoxedPrimitiveEquality\nComparableType\nComplexBooleanConstant\nCollectionToArraySafeParameter\nConditionalExpressionNumericPromotion\nDangerousLiteralNull\nDoubleBraceInitialization\nDurationFrom\nDurationTemporalUnit\nEmptyTopLevelDeclaration\nEqualsNull\nEqualsReference\nFormatString\nFromTemporalAccessor\nGetClassOnAnnotation\nGetClassOnClass\nHashtableContains\nIdentityBinaryExpression\nIdentityHashMapBoxing\nInstantTemporalUnit\nInvalidTimeZoneID\nInvalidZoneId\nIsInstanceIncompatibleType\nJUnitParameterMethodNotFound\nLockOnBoxedPrimitive\nMathRoundIntLong\nMislabeledAndroidString\nMisusedDayOfYear\nMissingSuperCall\nMisusedWeekYear\nModifyingCollectionWithItself\nNoCanIgnoreReturnValueOnClasses\nNonRuntimeAnnotation\nNullableOnContainingClass\nNullTernary\nOverridesJavaxInjectableMethod\nParcelableCreator\nPeriodFrom\nPreconditionsInvalidPlaceholder\nProtoBuilderReturnValueIgnored\nProtoFieldNullComparison\nRandomModInteger\nRectIntersectReturnValueIgnored\nReturnValueIgnored\nSelfAssignment\nSelfComparison\nSelfEquals\nSizeGreaterThanOrEqualsZero\nStringBuilderInitWithChar\nTreeToString\nTryFailThrowable\nUnnecessaryCheckNotNull\nUnusedCollectionModifiedInPlace\nXorPower\n\nSee https://errorprone.info/bugpatterns for more\ninformation on the checks.\n\nBug: 253827323\nTest: m RUN_ERROR_PRONE\u003dtrue javac-check\nChange-Id: I2a63b9824b50305602617a1328290cab1ecd6341\n" }, { "commit": "ca8ecd2da098bbbc166f7ef6399c8b8e891a4b17", "tree": "daf439cf472961747944c5e6baea3c64d1002d10", "parents": [ "ac7c4448c17ba48bb9c6aca8d0e56bf986d109a4" ], "author": { "name": "Amos Bianchi", "email": "amosbianchi@google.com", "time": "Tue Aug 02 15:41:18 2022 -0700" }, "committer": { "name": "Amos Bianchi", "email": "amosbianchi@google.com", "time": "Mon Oct 10 09:19:40 2022 -0700" }, "message": "Make jsr330 library available to Device Lock module.\n\nBug: b/241442337\nTest: service successfully starts\nTest: atest DeviceLockUnitTests\nTest: cts-tradefed run cts -m CtsDeviceLockTestCases\n\nChange-Id: If65432348fb71e0df1408722d6933371a4d8d16b\n" }, { "commit": "ac7c4448c17ba48bb9c6aca8d0e56bf986d109a4", "tree": "82d7e6f3f5d9e936c308f6e4b43c98993b9eacc7", "parents": [ "ab90f2beda909cba54e851866c75bd08557ff11b" ], "author": { "name": "Magdi", "email": "magdi@google.com", "time": "Mon Sep 12 13:32:25 2022 +0000" }, "committer": { "name": "Magdi", "email": "magdi@google.com", "time": "Wed Sep 14 14:17:48 2022 +0000" }, "message": "Add healthConnectController in apex_avalilable\n\nTest: m\nBug: 246299481\nChange-Id: Iac5d7ec1fd32e573e1b494269a504230baaf2f5a\n" }, { "commit": "ab90f2beda909cba54e851866c75bd08557ff11b", "tree": "fdeae4c75ad4f48b5398a2aca070781348694f8a", "parents": [ "07294f6a73d136513fa0ec9d38baa3bc62d03b03", "4c4aa4845644802f7357d6374c35240ddeb1db25" ], "author": { "name": "Presubmit Automerger Backend", "email": "android-build-presubmit-automerger-backend@system.gserviceaccount.com", "time": "Tue Aug 02 13:36:13 2022 +0000" }, "committer": { "name": "Presubmit Automerger Backend", "email": "android-build-presubmit-automerger-backend@system.gserviceaccount.com", "time": "Tue Aug 02 13:36:13 2022 +0000" }, "message": "[automerge] Add ondevicepersonalization in apex_available. 2p: 4c4aa48456\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/19487089\n\nBug: 241003305\nChange-Id: I15a75acde57b8018df57513ce6a2c4a116dc2ec6\n" }, { "commit": "4c4aa4845644802f7357d6374c35240ddeb1db25", "tree": "fdeae4c75ad4f48b5398a2aca070781348694f8a", "parents": [ "f6e74d82c172baeaba48865ae6910dbdf0c92bd8" ], "author": { "name": "Andrew Vuong", "email": "akvuong@google.com", "time": "Mon Aug 01 21:28:45 2022 +0000" }, "committer": { "name": "Andrew Vuong", "email": "akvuong@google.com", "time": "Tue Aug 02 13:35:45 2022 +0000" }, "message": "Add ondevicepersonalization in apex_available.\n\nWe need to build ondevicepersonalization with mdd in static_libs and it\nrequires jsr330 add ondevicepersonalization to apex_available property\n\nBug: 241003305\nTest: mma\nChange-Id: Icfcfa2bee09e0c7e1931e5012da74087990071d6\n" }, { "commit": "07294f6a73d136513fa0ec9d38baa3bc62d03b03", "tree": "b31fc859df46b052428ec4da1360f8a8815202ae", "parents": [ "1f5ea49133b47534c45012b858a488eaffc73ce5", "f6e74d82c172baeaba48865ae6910dbdf0c92bd8" ], "author": { "name": "Hao Liu", "email": "haoliuu@google.com", "time": "Fri Jul 15 21:59:16 2022 +0000" }, "committer": { "name": "Presubmit Automerger Backend", "email": "android-build-presubmit-automerger-backend@system.gserviceaccount.com", "time": "Fri Jul 15 21:59:16 2022 +0000" }, "message": "[automerge] Add adservices in apex_availble. 2p: f6e74d82c1\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/19290774\n\nBug: 239230416\nChange-Id: Ia2f7aefc12275e3a92c393d32b7fca1b021ab7a9\n" }, { "commit": "f6e74d82c172baeaba48865ae6910dbdf0c92bd8", "tree": "b31fc859df46b052428ec4da1360f8a8815202ae", "parents": [ "1f5ea49133b47534c45012b858a488eaffc73ce5" ], "author": { "name": "Hao Liu", "email": "haoliuu@google.com", "time": "Fri Jul 15 17:58:57 2022 -0400" }, "committer": { "name": "Hao Liu", "email": "haoliuu@google.com", "time": "Fri Jul 15 17:58:57 2022 -0400" }, "message": "Add adservices in apex_availble.\n\nWe need to build adservices with mdd in static_libs and it requires jsr330 add adservices to apex_availble property.\n\nBug: 239230416\n\nTest: mma\nChange-Id: I5a8049e508cd4f9818dc304e4ae8042b85a6b831\n" }, { "commit": "1f5ea49133b47534c45012b858a488eaffc73ce5", "tree": "b5430f917b72fe5d8a40463304d9db9ba3be9af2", "parents": [ "a5e57ff01099d9537e5e979ef20b8f71bc73a2b6", "8254452e3af03de7ea4e2ab26d6ea1d197a2f5fe" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jun 02 16:49:40 2021 +0000" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jun 02 16:49:40 2021 +0000" }, "message": "Merge sc-mainline-prod\n\nBug: 189946434\nChange-Id: Ia785e81876f708250d38c81bb0702077a1a177e6\n" }, { "commit": "8254452e3af03de7ea4e2ab26d6ea1d197a2f5fe", "tree": "b5430f917b72fe5d8a40463304d9db9ba3be9af2", "parents": [ "583f3466ab48557afea5733da5a95aa27962f787", "cddfcb8e6b4b88fa55697150653cfa7eae7e72ea" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Wed Feb 17 20:30:55 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 17 20:30:55 2021 +0000" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to external/jsr330 am: b1df19de09 am: 4e4592a4ba am: dbda358af0 am: cddfcb8e6b\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jsr330/+/1588822\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I570384dc7790a63db1fc59a81652548201e409de\n" }, { "commit": "a5e57ff01099d9537e5e979ef20b8f71bc73a2b6", "tree": "b5430f917b72fe5d8a40463304d9db9ba3be9af2", "parents": [ "583f3466ab48557afea5733da5a95aa27962f787", "cddfcb8e6b4b88fa55697150653cfa7eae7e72ea" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Wed Feb 17 20:28:30 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 17 20:28:30 2021 +0000" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to external/jsr330 am: b1df19de09 am: 4e4592a4ba am: dbda358af0 am: cddfcb8e6b\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jsr330/+/1588822\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I0956e1a775c55980625663c33d220f8086fccf24\n" }, { "commit": "cddfcb8e6b4b88fa55697150653cfa7eae7e72ea", "tree": "b5430f917b72fe5d8a40463304d9db9ba3be9af2", "parents": [ "583f3466ab48557afea5733da5a95aa27962f787", "dbda358af02acb8ac4de7de66eec8b784390fc0a" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Wed Feb 17 19:43:50 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 17 19:43:50 2021 +0000" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to external/jsr330 am: b1df19de09 am: 4e4592a4ba am: dbda358af0\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jsr330/+/1588822\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I7beb191771105f47ed68c03c1f9db7e41c60cd79\n" }, { "commit": "dbda358af02acb8ac4de7de66eec8b784390fc0a", "tree": "b5430f917b72fe5d8a40463304d9db9ba3be9af2", "parents": [ "d15075f2cec68921e2d4faeee17e1b69e9ec31b8", "4e4592a4ba55bf28276e94e70db0fc32e5db01af" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Wed Feb 17 18:48:49 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 17 18:48:49 2021 +0000" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to external/jsr330 am: b1df19de09 am: 4e4592a4ba\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jsr330/+/1588822\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I5b86cad370bedd78d634180ab7979671f94c168d\n" }, { "commit": "4e4592a4ba55bf28276e94e70db0fc32e5db01af", "tree": "b5430f917b72fe5d8a40463304d9db9ba3be9af2", "parents": [ "d15075f2cec68921e2d4faeee17e1b69e9ec31b8", "b1df19de090f2f2736dc3d7019248ae097f4742d" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Wed Feb 17 18:07:15 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 17 18:07:15 2021 +0000" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to external/jsr330 am: b1df19de09\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jsr330/+/1588822\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I5f61d2dbcf23abf3011e9ebfd429966e02d13fde\n" }, { "commit": "b1df19de090f2f2736dc3d7019248ae097f4742d", "tree": "b5430f917b72fe5d8a40463304d9db9ba3be9af2", "parents": [ "d15075f2cec68921e2d4faeee17e1b69e9ec31b8" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 12 21:37:57 2021 -0800" }, "committer": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 12 21:37:57 2021 -0800" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to external/jsr330\n\nAdded SPDX-license-identifier-Apache-2.0 to:\n Android.bp\n\nBug: 68860345\nBug: 151177513\nBug: 151953481\n\nTest: m all\n\nExempt-From-Owner-Approval: janitorial work\nChange-Id: If2dfc4ed083071258533eeaae7b11e0ff2db551e\n" }, { "commit": "583f3466ab48557afea5733da5a95aa27962f787", "tree": "8036e1a3b0cf563ccf32d63ddc18d26a975fbc8d", "parents": [ "4221d13d2c4079d3299c1d3265ed93564b84c78b", "d15075f2cec68921e2d4faeee17e1b69e9ec31b8" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Wed Apr 29 09:42:17 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 29 09:42:17 2020 +0000" }, "message": "Add METADATA to jsr330: Apache2\u003dNOTICE am: ab8ad49b5e am: 5209aa2c7c am: eeb75971dc am: e5e54b3ae5 am: d15075f2ce\n\nChange-Id: If0f67c05ae570e16ff59198118b793fae8c571d3\n" }, { "commit": "d15075f2cec68921e2d4faeee17e1b69e9ec31b8", "tree": "8036e1a3b0cf563ccf32d63ddc18d26a975fbc8d", "parents": [ "4221d13d2c4079d3299c1d3265ed93564b84c78b", "e5e54b3ae513dcea529a741bea45ac47c7426b52" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Wed Apr 29 09:24:13 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 29 09:24:13 2020 +0000" }, "message": "Add METADATA to jsr330: Apache2\u003dNOTICE am: ab8ad49b5e am: 5209aa2c7c am: eeb75971dc am: e5e54b3ae5\n\nChange-Id: I8be0dbecc1ad2f0914a5e7f4ff76fdbcb94e824c\n" }, { "commit": "e5e54b3ae513dcea529a741bea45ac47c7426b52", "tree": "8036e1a3b0cf563ccf32d63ddc18d26a975fbc8d", "parents": [ "4221d13d2c4079d3299c1d3265ed93564b84c78b", "eeb75971dc9762ad75372f397e70d4e1e951910f" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Wed Apr 29 09:08:39 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 29 09:08:39 2020 +0000" }, "message": "Add METADATA to jsr330: Apache2\u003dNOTICE am: ab8ad49b5e am: 5209aa2c7c am: eeb75971dc\n\nChange-Id: I32b47f20075294f0fc7a191b78800944179e04ee\n" }, { "commit": "eeb75971dc9762ad75372f397e70d4e1e951910f", "tree": "8036e1a3b0cf563ccf32d63ddc18d26a975fbc8d", "parents": [ "4221d13d2c4079d3299c1d3265ed93564b84c78b", "5209aa2c7c1da68683ca9ff4d18c221126230262" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Wed Apr 29 08:50:02 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 29 08:50:02 2020 +0000" }, "message": "Add METADATA to jsr330: Apache2\u003dNOTICE am: ab8ad49b5e am: 5209aa2c7c\n\nChange-Id: I362a946951ded14350be0271a7e9546f72dc7856\n" }, { "commit": "5209aa2c7c1da68683ca9ff4d18c221126230262", "tree": "8036e1a3b0cf563ccf32d63ddc18d26a975fbc8d", "parents": [ "4221d13d2c4079d3299c1d3265ed93564b84c78b", "ab8ad49b5e7d9194492c2737354f6dfabcc76d22" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Wed Apr 29 08:34:08 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 29 08:34:08 2020 +0000" }, "message": "Add METADATA to jsr330: Apache2\u003dNOTICE am: ab8ad49b5e\n\nChange-Id: I7fffc107b3c81a396d50ddd638fb6c69a29c7277\n" }, { "commit": "ab8ad49b5e7d9194492c2737354f6dfabcc76d22", "tree": "8036e1a3b0cf563ccf32d63ddc18d26a975fbc8d", "parents": [ "4221d13d2c4079d3299c1d3265ed93564b84c78b" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Apr 28 10:35:39 2020 -0700" }, "committer": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Apr 28 10:35:39 2020 -0700" }, "message": "Add METADATA to jsr330: Apache2\u003dNOTICE\n\nBug: 68860345\nBug: 69058154\nBug: 151953481\n\nTest: no code changes\nChange-Id: I6b6312a22bc47039338350cd8fb537343549b70f\n" }, { "commit": "4221d13d2c4079d3299c1d3265ed93564b84c78b", "tree": "152af26f169a10312760a874a554d3f9b31f7056", "parents": [ "9814c2307ff9065dd9ae59042cb26038b2f5bb95", "8638b2a4492754c2ed64d3eb8590195599f22442" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sun Feb 24 01:35:20 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Feb 24 01:35:20 2019 -0800" }, "message": "[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master\nam: 8638b2a449 -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: Ieaf5a74d05186301aa3e99e9f077c70efd824839\n" }, { "commit": "8638b2a4492754c2ed64d3eb8590195599f22442", "tree": "152af26f169a10312760a874a554d3f9b31f7056", "parents": [ "8e50ce832cc65307284d8d86d8346e2afdf6ab68", "70d5e4861cfdfd6840464ff193952c3b9cdaa519" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Feb 20 16:18:30 2019 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Feb 20 16:18:30 2019 -0800" }, "message": "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master\n\nBug: 120848293\nChange-Id: I4f29d99b408119893b7a3be17bdb6ec263dbfb2d\n" }, { "commit": "9814c2307ff9065dd9ae59042cb26038b2f5bb95", "tree": "152af26f169a10312760a874a554d3f9b31f7056", "parents": [ "12e2ef32ccb7e020909eb6ee23a64989d504b34c", "70d5e4861cfdfd6840464ff193952c3b9cdaa519" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Fri Jan 11 10:48:25 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jan 11 10:48:25 2019 -0800" }, "message": "Add default code reviewers into OWNERS am: 4e58e1dd1e am: 8e50ce832c\nam: 70d5e4861c\n\nChange-Id: Ibc67af49d0bff9a9d038de4990fffe467356a099\n" }, { "commit": "70d5e4861cfdfd6840464ff193952c3b9cdaa519", "tree": "152af26f169a10312760a874a554d3f9b31f7056", "parents": [ "c90e8aad72667c1cbcf597948fb80dc45b68461e", "8e50ce832cc65307284d8d86d8346e2afdf6ab68" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Fri Jan 11 10:13:25 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jan 11 10:13:25 2019 -0800" }, "message": "Add default code reviewers into OWNERS am: 4e58e1dd1e\nam: 8e50ce832c\n\nChange-Id: I545065cfa313199e15b7eb527bd1fcf4295ba4f3\n" }, { "commit": "8e50ce832cc65307284d8d86d8346e2afdf6ab68", "tree": "152af26f169a10312760a874a554d3f9b31f7056", "parents": [ "8b4eb7a907916b91abc00481bfdb46d94fe2d203", "4e58e1dd1ea4d35cb877e47fdeb4322d821a5ac8" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Fri Jan 11 09:52:43 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jan 11 09:52:43 2019 -0800" }, "message": "Add default code reviewers into OWNERS\nam: 4e58e1dd1e\n\nChange-Id: I13af8507c054c06b0f9e498d93cc2c5048337ae6\n" }, { "commit": "4e58e1dd1ea4d35cb877e47fdeb4322d821a5ac8", "tree": "152af26f169a10312760a874a554d3f9b31f7056", "parents": [ "c749ade438c346a7a8be370991b87cd7c9c7213b" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Thu Jan 10 11:42:43 2019 -0800" }, "committer": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Thu Jan 10 13:32:11 2019 -0800" }, "message": "Add default code reviewers into OWNERS\n\nBug: 33166666\nTest: gerrit uploader\nChange-Id: Ibac968261167d8cd34d5e01a71226aa47aecfb70\n" }, { "commit": "12e2ef32ccb7e020909eb6ee23a64989d504b34c", "tree": "3bb7e2f3ce5d570fd5919102d65d80f99bd0847a", "parents": [ "8ef1f9dde8e3bbfbdac76d39265bbb0588c3330b", "c90e8aad72667c1cbcf597948fb80dc45b68461e" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Dec 10 12:48:45 2018 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Dec 10 12:48:45 2018 -0800" }, "message": "[automerger skipped] DO NOT MERGE am: c749ade438 -s ours am: 8b4eb7a907 -s ours\nam: c90e8aad72 -s ours\n\nChange-Id: I0cc556d3aef2fa46bcc495b5cde45ffe171de866\n" }, { "commit": "c90e8aad72667c1cbcf597948fb80dc45b68461e", "tree": "3bb7e2f3ce5d570fd5919102d65d80f99bd0847a", "parents": [ "8ef1f9dde8e3bbfbdac76d39265bbb0588c3330b", "8b4eb7a907916b91abc00481bfdb46d94fe2d203" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Dec 10 10:51:39 2018 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Dec 10 10:51:39 2018 -0800" }, "message": "[automerger skipped] DO NOT MERGE am: c749ade438 -s ours\nam: 8b4eb7a907 -s ours\n\nChange-Id: Ia933fb4af29068053e3d6370de49ccbd6677c5f0\n" }, { "commit": "8b4eb7a907916b91abc00481bfdb46d94fe2d203", "tree": "3bb7e2f3ce5d570fd5919102d65d80f99bd0847a", "parents": [ "8ef1f9dde8e3bbfbdac76d39265bbb0588c3330b", "c749ade438c346a7a8be370991b87cd7c9c7213b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Dec 10 09:48:55 2018 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Dec 10 09:48:55 2018 -0800" }, "message": "[automerger skipped] DO NOT MERGE\nam: c749ade438 -s ours\n\nChange-Id: I3f0bd58588ae4d52e16b14a49a9ff869a156eaa7\n" }, { "commit": "c749ade438c346a7a8be370991b87cd7c9c7213b", "tree": "3bb7e2f3ce5d570fd5919102d65d80f99bd0847a", "parents": [ "8ef1f9dde8e3bbfbdac76d39265bbb0588c3330b", "10d166d74bc5877ed1b9623bd4b01d21451f9380" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 07 16:14:38 2018 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 07 16:14:38 2018 -0800" }, "message": "DO NOT MERGE\n\nMerge pie-platform-release (PPRL.181205.001, history only) into master\n\nBug: 120502534\nChange-Id: I7db3ad0871e3565cc64620b68027580c4e53ba32\n" }, { "commit": "10d166d74bc5877ed1b9623bd4b01d21451f9380", "tree": "3bb7e2f3ce5d570fd5919102d65d80f99bd0847a", "parents": [ "78bc240098b13fabe15f661f41c42228f9303def", "8ef1f9dde8e3bbfbdac76d39265bbb0588c3330b" ], "author": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Wed Feb 07 13:30:25 2018 +0000" }, "committer": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Wed Feb 07 13:30:25 2018 +0000" }, "message": "Snap for 4590521 from 8ef1f9dde8e3bbfbdac76d39265bbb0588c3330b to pi-release\n\nChange-Id: I6a73bf51bfd0c4167368be567586a43e3bdb3ce2\n" }, { "commit": "8ef1f9dde8e3bbfbdac76d39265bbb0588c3330b", "tree": "3bb7e2f3ce5d570fd5919102d65d80f99bd0847a", "parents": [ "d2ef1fd42c924de0b6dd5b307941930aa6505a9b", "23f6e50e2a7ada92d8074aff21b00052d075fa93" ], "author": { "name": "Jiyong Park", "email": "jiyong@google.com", "time": "Wed Feb 07 01:30:55 2018 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Feb 07 01:30:55 2018 +0000" }, "message": "Build jsr330 with core_current am: 231a7a1e3a am: 5aab67b0fe\nam: 23f6e50e2a\n\nChange-Id: I55633b9f1209d8c61ff1132bfd52860576bfc3e9\n" }, { "commit": "23f6e50e2a7ada92d8074aff21b00052d075fa93", "tree": "3bb7e2f3ce5d570fd5919102d65d80f99bd0847a", "parents": [ "7c2b71e5c5529d2298cd52a1bcf9678367e896c8", "5aab67b0fedc67198e2ed25fe8c6177410d498c4" ], "author": { "name": "Jiyong Park", "email": "jiyong@google.com", "time": "Tue Feb 06 23:45:57 2018 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Feb 06 23:45:57 2018 +0000" }, "message": "Build jsr330 with core_current am: 231a7a1e3a\nam: 5aab67b0fe\n\nChange-Id: Ie10a756fd6b561795f2a060db992ea728bae8c27\n" }, { "commit": "5aab67b0fedc67198e2ed25fe8c6177410d498c4", "tree": "3bb7e2f3ce5d570fd5919102d65d80f99bd0847a", "parents": [ "88648678d0db36f6fdf8a72faf61a6c921571d1c", "231a7a1e3a4e049aa1bf14ff69f947f05bbad7ec" ], "author": { "name": "Jiyong Park", "email": "jiyong@google.com", "time": "Tue Feb 06 23:12:30 2018 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Feb 06 23:12:30 2018 +0000" }, "message": "Build jsr330 with core_current\nam: 231a7a1e3a\n\nChange-Id: I44fa72c1e0dc8a69cf921c4dfd1ac0723973b124\n" }, { "commit": "231a7a1e3a4e049aa1bf14ff69f947f05bbad7ec", "tree": "3bb7e2f3ce5d570fd5919102d65d80f99bd0847a", "parents": [ "23235e610eb369d813fd3685b3283dc94b59e65c" ], "author": { "name": "Jiyong Park", "email": "jiyong@google.com", "time": "Wed Jan 31 10:59:14 2018 +0900" }, "committer": { "name": "Jiyong Park", "email": "jiyong@google.com", "time": "Wed Jan 31 10:59:14 2018 +0900" }, "message": "Build jsr330 with core_current\n\nUsing core_current ensures that the module is not using any Android APIs\n(e.g. APIs under android.* packages), but only core Java APIs.\n\nBug: 72206056\nTest: m -j jsr330\nChange-Id: I8b6a4b4565e37003877fd2032498bdbcde28e246\n" }, { "commit": "78bc240098b13fabe15f661f41c42228f9303def", "tree": "30be7846e4bf428f9ecadaa2dd41ce3d65066e1d", "parents": [ "6b7ce1433f6d47d5028e54d9851931dcef70aad3", "d2ef1fd42c924de0b6dd5b307941930aa6505a9b" ], "author": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Thu Jan 18 08:30:21 2018 +0000" }, "committer": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Thu Jan 18 08:30:21 2018 +0000" }, "message": "Snap for 4551672 from d2ef1fd42c924de0b6dd5b307941930aa6505a9b to pi-release\n\nChange-Id: I5601282ddee4849b756db66a7f213b8d09da1bc8\n" }, { "commit": "d2ef1fd42c924de0b6dd5b307941930aa6505a9b", "tree": "30be7846e4bf428f9ecadaa2dd41ce3d65066e1d", "parents": [ "b77ab5dde6092dee620eed28ea336cbfe98f5714", "7c2b71e5c5529d2298cd52a1bcf9678367e896c8" ], "author": { "name": "Sundong Ahn", "email": "sundongahn@google.com", "time": "Wed Jan 17 01:37:25 2018 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jan 17 01:37:25 2018 +0000" }, "message": "Add LOCAL_SDK_VERSION in jsr330 am: 23235e610e am: 88648678d0\nam: 7c2b71e5c5\n\nChange-Id: I1165b2ac4bec68241b113471031ecd2b0fd19c83\n" }, { "commit": "7c2b71e5c5529d2298cd52a1bcf9678367e896c8", "tree": "30be7846e4bf428f9ecadaa2dd41ce3d65066e1d", "parents": [ "0eb3c2a47d9b879cb81c461417e08d53ea1b0efa", "88648678d0db36f6fdf8a72faf61a6c921571d1c" ], "author": { "name": "Sundong Ahn", "email": "sundongahn@google.com", "time": "Wed Jan 17 01:34:54 2018 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jan 17 01:34:54 2018 +0000" }, "message": "Add LOCAL_SDK_VERSION in jsr330 am: 23235e610e\nam: 88648678d0\n\nChange-Id: If4ae27d47537cd52e64686704a01572375fb368e\n" }, { "commit": "88648678d0db36f6fdf8a72faf61a6c921571d1c", "tree": "30be7846e4bf428f9ecadaa2dd41ce3d65066e1d", "parents": [ "a6cdcc9444542b640592b3df5d4106e926b2677c", "23235e610eb369d813fd3685b3283dc94b59e65c" ], "author": { "name": "Sundong Ahn", "email": "sundongahn@google.com", "time": "Wed Jan 17 01:29:53 2018 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jan 17 01:29:53 2018 +0000" }, "message": "Add LOCAL_SDK_VERSION in jsr330\nam: 23235e610e\n\nChange-Id: I83c773cd0f800aa972342fc9aa6746c446529bce\n" }, { "commit": "23235e610eb369d813fd3685b3283dc94b59e65c", "tree": "30be7846e4bf428f9ecadaa2dd41ce3d65066e1d", "parents": [ "46e8e0123e114a98dd215db53dfe2855f5524424" ], "author": { "name": "Sundong Ahn", "email": "sundongahn@google.com", "time": "Tue Jan 16 16:03:16 2018 +0900" }, "committer": { "name": "Sundong Ahn", "email": "sundongahn@google.com", "time": "Tue Jan 16 18:31:40 2018 +0900" }, "message": "Add LOCAL_SDK_VERSION in jsr330\n\nThe jsr330 is using only public API. However it is defined\njava:platform which can use internal API, since it is not\ndefined LOCAL_SDK_VERSION.\nSo, LOCAL_SDK_VERSION :\u003d current is added in jsr330, because it\ncan be turn into errors when link type check becomes more strict.\n\nBug: 69899800\nTest: mma -j under system-helper dir\nChange-Id: I1167ffb5a8543f2de8ac27e4b63637be6bf803fd\n" }, { "commit": "6b7ce1433f6d47d5028e54d9851931dcef70aad3", "tree": "a1c63ebd5277899e4298d351b5f76ff6834c347a", "parents": [ "d15be3f228885ce6ed2098ff2dcbf6c1085d83ba", "b77ab5dde6092dee620eed28ea336cbfe98f5714" ], "author": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Wed Dec 13 08:27:36 2017 +0000" }, "committer": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Wed Dec 13 08:27:36 2017 +0000" }, "message": "Snap for 4500033 from b77ab5dde6092dee620eed28ea336cbfe98f5714 to pi-release\n\nChange-Id: Ie9060ec78462b8e39375e177f1342549d0bf49f1\n" }, { "commit": "b77ab5dde6092dee620eed28ea336cbfe98f5714", "tree": "a1c63ebd5277899e4298d351b5f76ff6834c347a", "parents": [ "d15be3f228885ce6ed2098ff2dcbf6c1085d83ba", "0eb3c2a47d9b879cb81c461417e08d53ea1b0efa" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Dec 12 23:44:13 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Dec 12 23:44:13 2017 +0000" }, "message": "Convert external/jsr330 to Android.bp am: 46e8e0123e am: a6cdcc9444\nam: 0eb3c2a47d\n\nChange-Id: I9fd6f0a60001e26df62714f76c20d30a21081459\n" }, { "commit": "0eb3c2a47d9b879cb81c461417e08d53ea1b0efa", "tree": "a1c63ebd5277899e4298d351b5f76ff6834c347a", "parents": [ "d15be3f228885ce6ed2098ff2dcbf6c1085d83ba", "a6cdcc9444542b640592b3df5d4106e926b2677c" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Dec 12 23:29:19 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Dec 12 23:29:19 2017 +0000" }, "message": "Convert external/jsr330 to Android.bp am: 46e8e0123e\nam: a6cdcc9444\n\nChange-Id: I0a357fc74812041aff5a9e944ba2259acae8d7df\n" }, { "commit": "a6cdcc9444542b640592b3df5d4106e926b2677c", "tree": "a1c63ebd5277899e4298d351b5f76ff6834c347a", "parents": [ "d15be3f228885ce6ed2098ff2dcbf6c1085d83ba", "46e8e0123e114a98dd215db53dfe2855f5524424" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Dec 12 23:17:16 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Dec 12 23:17:16 2017 +0000" }, "message": "Convert external/jsr330 to Android.bp\nam: 46e8e0123e\n\nChange-Id: I440112b3805b3cfe6f552ee3d01b5ef16d6b13e6\n" }, { "commit": "46e8e0123e114a98dd215db53dfe2855f5524424", "tree": "a1c63ebd5277899e4298d351b5f76ff6834c347a", "parents": [ "d15be3f228885ce6ed2098ff2dcbf6c1085d83ba" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Dec 08 18:11:25 2017 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Dec 08 18:11:25 2017 -0800" }, "message": "Convert external/jsr330 to Android.bp\n\nSee build/soong/README.md for more information.\n\nTest: m checkbuild\nChange-Id: I13fd809b9e5629b5313b8e51d25304edb328e172\n" }, { "commit": "d15be3f228885ce6ed2098ff2dcbf6c1085d83ba", "tree": "290780c926125b91f13dcc44947ca1a904d854c6", "parents": [ "e91fa9810fe3f6cc466bab9a9827f4f0ffe6cb7d", "de30ee496a13d0f71d8ddaee1e247c3e8e43e58d" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Jan 20 16:37:18 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jan 20 16:37:18 2017 +0000" }, "message": "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for jsr330-hostdex am: f75d423a6b am: 52fbc001db am: 673b71b701\nam: de30ee496a\n\nChange-Id: I61bcb99a9d94f43939f6f42cc3c3c6f2c9304b0c\n" }, { "commit": "de30ee496a13d0f71d8ddaee1e247c3e8e43e58d", "tree": "290780c926125b91f13dcc44947ca1a904d854c6", "parents": [ "c78be0d084ef680f3eb390c2fef3ec98a7cf13a2", "673b71b701100f66478ab553697f608f8da31122" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Jan 20 16:33:16 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jan 20 16:33:16 2017 +0000" }, "message": "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for jsr330-hostdex am: f75d423a6b am: 52fbc001db\nam: 673b71b701\n\nChange-Id: I1ca878c7ae8e7bad0ebef89b5bdab951d89c7a66\n" }, { "commit": "673b71b701100f66478ab553697f608f8da31122", "tree": "290780c926125b91f13dcc44947ca1a904d854c6", "parents": [ "5b207ea2112bf5c35b0e2ec9fe9c0b1c43f48166", "52fbc001db1da11e637422a15aac8c4ca8732b8d" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Jan 20 16:28:47 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jan 20 16:28:47 2017 +0000" }, "message": "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for jsr330-hostdex am: f75d423a6b\nam: 52fbc001db\n\nChange-Id: I2f6cb1105b89af32b98f3fafc03283edc27985fc\n" }, { "commit": "52fbc001db1da11e637422a15aac8c4ca8732b8d", "tree": "290780c926125b91f13dcc44947ca1a904d854c6", "parents": [ "997bbb52aa0a62bb41debe7cd715935795f02861", "f75d423a6b141fc2a8b62096b860db1e0da13b63" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Jan 20 16:24:17 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jan 20 16:24:17 2017 +0000" }, "message": "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for jsr330-hostdex\nam: f75d423a6b\n\nChange-Id: I99d406876d427c607a24cf53c90c32b11c68fa42\n" }, { "commit": "f75d423a6b141fc2a8b62096b860db1e0da13b63", "tree": "290780c926125b91f13dcc44947ca1a904d854c6", "parents": [ "997bbb52aa0a62bb41debe7cd715935795f02861" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Jan 19 11:16:52 2017 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Jan 19 14:25:50 2017 -0800" }, "message": "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for jsr330-hostdex\n\nBUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY must be used for libraries\nthat will be linked with LOCAL_STATIC_JAVA_LIBRARIES.\n\nTest: m -j java\nChange-Id: Ief65fa6da0892b16ecb6a3e2ce5dc3895a2ef04a\n" }, { "commit": "e91fa9810fe3f6cc466bab9a9827f4f0ffe6cb7d", "tree": "629bec673cc3ca14d1fe1c921d34198c5a6569c2", "parents": [ "3a10a731c6756088e56b4c83870c1aaf6563679f", "c78be0d084ef680f3eb390c2fef3ec98a7cf13a2" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue Nov 29 10:35:03 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Nov 29 10:35:03 2016 +0000" }, "message": "Use junit-host instead of junit am: e519dd3b14 am: 997bbb52aa am: 5b207ea211\nam: c78be0d084\n\nChange-Id: Ia8c2da4b070838881bb73b00bb3d8c6e36fec752\n" }, { "commit": "c78be0d084ef680f3eb390c2fef3ec98a7cf13a2", "tree": "629bec673cc3ca14d1fe1c921d34198c5a6569c2", "parents": [ "5072e1e8df800854dc43b2586208b994c08b8520", "5b207ea2112bf5c35b0e2ec9fe9c0b1c43f48166" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue Nov 29 10:30:34 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Nov 29 10:30:34 2016 +0000" }, "message": "Use junit-host instead of junit am: e519dd3b14 am: 997bbb52aa\nam: 5b207ea211\n\nChange-Id: I3a5140a7c9e8bd82e078518efc34967f4f995f85\n" }, { "commit": "5b207ea2112bf5c35b0e2ec9fe9c0b1c43f48166", "tree": "629bec673cc3ca14d1fe1c921d34198c5a6569c2", "parents": [ "5072e1e8df800854dc43b2586208b994c08b8520", "997bbb52aa0a62bb41debe7cd715935795f02861" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue Nov 29 10:26:00 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Nov 29 10:26:00 2016 +0000" }, "message": "Use junit-host instead of junit am: e519dd3b14\nam: 997bbb52aa\n\nChange-Id: I518ef4b654da108ec93359145d2aef7bddb91dc7\n" }, { "commit": "997bbb52aa0a62bb41debe7cd715935795f02861", "tree": "629bec673cc3ca14d1fe1c921d34198c5a6569c2", "parents": [ "5072e1e8df800854dc43b2586208b994c08b8520", "e519dd3b145c27e87f98914ab6034527b000c2e5" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue Nov 29 10:21:31 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Nov 29 10:21:31 2016 +0000" }, "message": "Use junit-host instead of junit\nam: e519dd3b14\n\nChange-Id: I1f7a3445aaf9e6e8a692160769eaa53680c15e86\n" }, { "commit": "e519dd3b145c27e87f98914ab6034527b000c2e5", "tree": "629bec673cc3ca14d1fe1c921d34198c5a6569c2", "parents": [ "ded32186511387be56e353485f476262d6b14c66" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Mon Nov 28 16:42:52 2016 +0000" }, "committer": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Mon Nov 28 16:42:52 2016 +0000" }, "message": "Use junit-host instead of junit\n\nBug: 30188076\nTest: make checkbuild\nChange-Id: I696da0b41b42e327dd5e23e82c665133c1a22dc1\n" }, { "commit": "3a10a731c6756088e56b4c83870c1aaf6563679f", "tree": "55128c8aaa2e84952bcd4fbff1a923fd032b45bd", "parents": [ "e91a060fbbec674073d94297c393fa2c58b189b7", "5072e1e8df800854dc43b2586208b994c08b8520" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Thu Apr 28 02:17:51 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Apr 28 02:17:51 2016 +0000" }, "message": "build: Add device-side support for the AOSP. am: 1a483e9 am: a3a92a4 am: ded3218\nam: 5072e1e\n\n* commit \u00275072e1e8df800854dc43b2586208b994c08b8520\u0027:\n build: Add device-side support for the AOSP.\n\nChange-Id: I42053b3aaa001abfe1157220ad132a01d779f2ee\n" }, { "commit": "5072e1e8df800854dc43b2586208b994c08b8520", "tree": "55128c8aaa2e84952bcd4fbff1a923fd032b45bd", "parents": [ "d31cbb1dffebf151a499d83cfd2d9981c9e098d7", "ded32186511387be56e353485f476262d6b14c66" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Thu Apr 28 02:14:23 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Apr 28 02:14:23 2016 +0000" }, "message": "build: Add device-side support for the AOSP. am: 1a483e9 am: a3a92a4\nam: ded3218\n\n* commit \u0027ded32186511387be56e353485f476262d6b14c66\u0027:\n build: Add device-side support for the AOSP.\n\nChange-Id: I82cc9b370a74bc734d7f4b07a13a07d1a6178564\n" }, { "commit": "ded32186511387be56e353485f476262d6b14c66", "tree": "55128c8aaa2e84952bcd4fbff1a923fd032b45bd", "parents": [ "d31cbb1dffebf151a499d83cfd2d9981c9e098d7", "a3a92a4b0105842965b78cdfa6fefeacee3c85d9" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Thu Apr 28 01:50:13 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Apr 28 01:50:13 2016 +0000" }, "message": "build: Add device-side support for the AOSP. am: 1a483e9\nam: a3a92a4\n\n* commit \u0027a3a92a4b0105842965b78cdfa6fefeacee3c85d9\u0027:\n build: Add device-side support for the AOSP.\n\nChange-Id: Icb089caad3aba4b4f14bf53674654adf0f8b9431\n" }, { "commit": "a3a92a4b0105842965b78cdfa6fefeacee3c85d9", "tree": "55128c8aaa2e84952bcd4fbff1a923fd032b45bd", "parents": [ "120d55ed85ca460ab29241916bf23743f6bc65da", "1a483e95a0602c89dd98be7c68d23424d2471436" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Thu Apr 28 01:47:19 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Apr 28 01:47:19 2016 +0000" }, "message": "build: Add device-side support for the AOSP.\nam: 1a483e9\n\n* commit \u00271a483e95a0602c89dd98be7c68d23424d2471436\u0027:\n build: Add device-side support for the AOSP.\n\nChange-Id: I7cee69c7e9f7280ea26eb385104e76ce0281819d\n" }, { "commit": "1a483e95a0602c89dd98be7c68d23424d2471436", "tree": "55128c8aaa2e84952bcd4fbff1a923fd032b45bd", "parents": [ "120d55ed85ca460ab29241916bf23743f6bc65da" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Apr 01 14:21:35 2016 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Tue Apr 26 17:06:49 2016 -0700" }, "message": "build: Add device-side support for the AOSP.\n\nBug: 27521545\nChange-Id: Ic254894f7dc838e0529b6cd648838b51fea84d0d\n(cherry picked from commit 57916beef7b9401b594906d26833e0867bf60829)\n" }, { "commit": "e91a060fbbec674073d94297c393fa2c58b189b7", "tree": "55128c8aaa2e84952bcd4fbff1a923fd032b45bd", "parents": [ "74d7e4ee09ca3eff1c80df535f398b4561043c1f", "d31cbb1dffebf151a499d83cfd2d9981c9e098d7" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Apr 04 23:50:52 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Apr 04 23:50:52 2016 +0000" }, "message": "build: Add device-side support for the AOSP. am: 57916be\nam: d31cbb1\n\n* commit \u0027d31cbb1dffebf151a499d83cfd2d9981c9e098d7\u0027:\n build: Add device-side support for the AOSP.\n\nChange-Id: Ib363c70ce84c2e04ba8a1a94ff951bb7aa275a32\n" }, { "commit": "d31cbb1dffebf151a499d83cfd2d9981c9e098d7", "tree": "55128c8aaa2e84952bcd4fbff1a923fd032b45bd", "parents": [ "74d7e4ee09ca3eff1c80df535f398b4561043c1f", "57916beef7b9401b594906d26833e0867bf60829" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Apr 04 23:48:25 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Apr 04 23:48:25 2016 +0000" }, "message": "build: Add device-side support for the AOSP.\nam: 57916be\n\n* commit \u002757916beef7b9401b594906d26833e0867bf60829\u0027:\n build: Add device-side support for the AOSP.\n\nChange-Id: I7694aec8430a98122c5b348ebe69dfec6e9be66a\n" }, { "commit": "57916beef7b9401b594906d26833e0867bf60829", "tree": "55128c8aaa2e84952bcd4fbff1a923fd032b45bd", "parents": [ "74d7e4ee09ca3eff1c80df535f398b4561043c1f" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Apr 01 14:21:35 2016 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Apr 01 14:21:35 2016 -0700" }, "message": "build: Add device-side support for the AOSP.\n\nBug: 27521545\nChange-Id: Ic254894f7dc838e0529b6cd648838b51fea84d0d\n" }, { "commit": "74d7e4ee09ca3eff1c80df535f398b4561043c1f", "tree": "70d5afae0bd672bba9654e64853f73348c8dfe0a", "parents": [ "ab59cd2330b788a4e2b2dbcd9701dd2c3a49955f", "120d55ed85ca460ab29241916bf23743f6bc65da" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Thu Mar 24 14:26:27 2016 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Thu Mar 24 14:26:34 2016 -0700" }, "message": "Merge remote-tracking branch \u0027goog/master\u0027 into nyc-dev\n\nBug: 27552463\nChange-Id: Ib32111bd227168159f9255ffcb46ece02a8d9b64\n" }, { "commit": "120d55ed85ca460ab29241916bf23743f6bc65da", "tree": "70d5afae0bd672bba9654e64853f73348c8dfe0a", "parents": [ "561171975ae6eb7a67f400bbed3a97ce1f429fa3" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Tue Mar 15 16:52:32 2016 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Mar 21 14:59:59 2016 -0700" }, "message": "build: Add support for building atinject within the AOSP (host only).\n\nBug: 27552463\nChange-Id: I71b4f3b26b9307b36444cecc75d67de03be9cb23\n" }, { "commit": "561171975ae6eb7a67f400bbed3a97ce1f429fa3", "tree": "f327a0b976f6bab465ef3ac3bc6ed0a328903e62", "parents": [ "6eb3a0e17c712678d0ad9004cef8f87726a3e547" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Tue Mar 15 16:43:10 2016 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Tue Mar 15 16:54:59 2016 -0700" }, "message": "android: Add project metadata\n\nBug: 27552463\nChange-Id: I990b1168cf831a769260bb1a76ef0c5ac687435f\n" } ], "next": "6eb3a0e17c712678d0ad9004cef8f87726a3e547" }