)]}' { "log": [ { "commit": "ef38a658a6a717b4a609fd1a53b98067e33302db", "tree": "daf0740277bcb2093669064704a4500cf21690ee", "parents": [ "eb3a33c0c9109b0079c79e90b6c32db7576f04ad", "8a47503683196e933d1532733185b19999bf9e21" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Dec 19 09:48:39 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 19 09:48:39 2024 -0800" }, "message": "Merge \"Add janitors to the OWNERS file\" into main am: 8a47503683\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/apache-http/+/3421841\n\nChange-Id: Id4d12c9bef753d13522b95a02d8affd85287dba6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8a47503683196e933d1532733185b19999bf9e21", "tree": "daf0740277bcb2093669064704a4500cf21690ee", "parents": [ "eb3a33c0c9109b0079c79e90b6c32db7576f04ad", "a3343ff6de79f7c505e51dce420642c0b78e96e8" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Dec 19 09:24:46 2024 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Dec 19 09:24:46 2024 -0800" }, "message": "Merge \"Add janitors to the OWNERS file\" into main" }, { "commit": "a3343ff6de79f7c505e51dce420642c0b78e96e8", "tree": "daf0740277bcb2093669064704a4500cf21690ee", "parents": [ "eb3a33c0c9109b0079c79e90b6c32db7576f04ad" ], "author": { "name": "Sadaf Ebrahimi", "email": "sadafebrahimi@google.com", "time": "Wed Dec 18 20:04:19 2024 +0000" }, "committer": { "name": "Sadaf Ebrahimi", "email": "sadafebrahimi@google.com", "time": "Wed Dec 18 20:04:19 2024 +0000" }, "message": "Add janitors to the OWNERS file\n\nTest: TreeHugger\nChange-Id: I17ca1292f48716641f8481ae575a72060ab9ddd5\n" }, { "commit": "eb3a33c0c9109b0079c79e90b6c32db7576f04ad", "tree": "ee422efceab47d8d32aa8c0b7fe862c7a9461145", "parents": [ "c7c9892baf7f7dc2a1db046e4c83f63be94dbe39", "06ca28b6cf51d265e7f50d24d7b5c8727738173c" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Jul 26 17:53:40 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jul 26 17:53:40 2024 +0000" }, "message": "Merge \"Specify default_to_stubs property in org.apache.http.legacy module definition\" into main am: c1a9790da8 am: 06ca28b6cf\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/apache-http/+/3187664\n\nChange-Id: Ia9a9b66eff8db283b7395754434d1d15c357badd\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "06ca28b6cf51d265e7f50d24d7b5c8727738173c", "tree": "ee422efceab47d8d32aa8c0b7fe862c7a9461145", "parents": [ "c7c9892baf7f7dc2a1db046e4c83f63be94dbe39", "c1a9790da8c126ad6cc0c5b3969ef30c69abcf0d" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Jul 26 17:32:04 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jul 26 17:32:04 2024 +0000" }, "message": "Merge \"Specify default_to_stubs property in org.apache.http.legacy module definition\" into main am: c1a9790da8\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/apache-http/+/3187664\n\nChange-Id: I424be1a1632571fbb3e4d1de9ef8b68d1cffd320\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c1a9790da8c126ad6cc0c5b3969ef30c69abcf0d", "tree": "ee422efceab47d8d32aa8c0b7fe862c7a9461145", "parents": [ "6a3950f36c9047c1bb4f1ad3eea531ba67c786d2", "b4a5d361c3afa892c57d147b5b3e333f791aec3e" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Jul 26 17:15:55 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jul 26 17:15:55 2024 +0000" }, "message": "Merge \"Specify default_to_stubs property in org.apache.http.legacy module definition\" into main" }, { "commit": "b4a5d361c3afa892c57d147b5b3e333f791aec3e", "tree": "ee422efceab47d8d32aa8c0b7fe862c7a9461145", "parents": [ "6a3950f36c9047c1bb4f1ad3eea531ba67c786d2" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Mon Jul 22 17:36:31 2024 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Mon Jul 22 17:36:31 2024 +0000" }, "message": "Specify default_to_stubs property in org.apache.http.legacy module definition\n\nSet default_to_stubs to true for the java_sdk_library\norg.apache.http.legacy to prevent accidental linking against\nimplementation.\n\nThis module is implicitly added as a dependency for source java modules\nvia the class loader context. Specifying the default_to_stubs property\nin this module has the following benefits:\n\n- Prevent accidental linking against the implementation library\n\nAlthough it is unlikely that the java_sdk_library \"magic\" will return\nthe implementation jar for the rdep of this module given that this\nmodule does not belong to any apexes, specifying this property clarifies\nand ensures that this module always returns the stubs to the rdeps even\nwhen they do not specify sdk_version.\n\n- Prevent this module from being flagged by the container validation\n check\n\nhttps://r.android.com/3183620 allows the top level sdk library to be\nrecognized as a stubs-providing module when it sets either\n`default_to_stubs` or `api_only` property to true. Based on this change,\nspecifying `default_to_stubs` to true for org.apache.http.legacy allows\nminimizing the allowlist of currently existing violations and prevents\nfuture module additions from being blocked by the container check, given\nthat this module is implicitly added as a dependency by the build\nsystem.\n\nTest: m nothing\nBug: 354029496\nChange-Id: I54137c4f4af2b2a6cd6d3da3f6a8393e4030c01a\n" }, { "commit": "c7c9892baf7f7dc2a1db046e4c83f63be94dbe39", "tree": "553b8cf60261dace5486d1b9447af43402c82c59", "parents": [ "358fc299ffe0e4787b8e41d100d0c66f0286fdc2", "6a3950f36c9047c1bb4f1ad3eea531ba67c786d2" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 21:50:12 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 29 21:50:12 2024 +0000" }, "message": "[automerger skipped] Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future am: 6a3950f36c -s ours\n\nam skip reason: Merged-In I0b2fc534e39e80597c2ee988ac5af703db19a96a with SHA-1 da399151cc is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-http/+/27145236\n\nChange-Id: I8fb16cdf25925c4874a488ddb260b3ba5bb6309e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6a3950f36c9047c1bb4f1ad3eea531ba67c786d2", "tree": "553b8cf60261dace5486d1b9447af43402c82c59", "parents": [ "da399151cc17b2ba06e07f0bc07c07405633a3b9", "358fc299ffe0e4787b8e41d100d0c66f0286fdc2" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 11:48:39 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 11:48:39 2024 -0700" }, "message": "Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future\n\nBug: 337098550\nMerged-In: I0b2fc534e39e80597c2ee988ac5af703db19a96a\nChange-Id: Ic497d4230b8bd79fc0294815bca2ccbef43d78ea\n" }, { "commit": "358fc299ffe0e4787b8e41d100d0c66f0286fdc2", "tree": "553b8cf60261dace5486d1b9447af43402c82c59", "parents": [ "50309ea75c3e4650af0d86f5ffb85bfd6f503aed", "da399151cc17b2ba06e07f0bc07c07405633a3b9" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Jan 18 03:58:35 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 18 03:58:35 2024 +0000" }, "message": "Merge \"Make the system-current.txt available for use by /vendor tests\" into main am: c166acd5b2 am: da399151cc\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/apache-http/+/2912714\n\nChange-Id: I4849fcd9ab11ed23d25b7daf61b8f205c33b858d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "da399151cc17b2ba06e07f0bc07c07405633a3b9", "tree": "553b8cf60261dace5486d1b9447af43402c82c59", "parents": [ "50309ea75c3e4650af0d86f5ffb85bfd6f503aed", "c166acd5b2487a6be17d9e92b27ab35d780cd6b5" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Jan 18 03:16:53 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 18 03:16:53 2024 +0000" }, "message": "Merge \"Make the system-current.txt available for use by /vendor tests\" into main am: c166acd5b2\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/apache-http/+/2912714\n\nChange-Id: I0b2fc534e39e80597c2ee988ac5af703db19a96a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c166acd5b2487a6be17d9e92b27ab35d780cd6b5", "tree": "553b8cf60261dace5486d1b9447af43402c82c59", "parents": [ "98d79fb0bbbda143b50c0f064d827e7ae891e9dc", "3775fd10691d23b679fc7d8047161fad61a5b70d" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Jan 18 02:10:17 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jan 18 02:10:17 2024 +0000" }, "message": "Merge \"Make the system-current.txt available for use by /vendor tests\" into main" }, { "commit": "3775fd10691d23b679fc7d8047161fad61a5b70d", "tree": "553b8cf60261dace5486d1b9447af43402c82c59", "parents": [ "98d79fb0bbbda143b50c0f064d827e7ae891e9dc" ], "author": { "name": "Nelson Li", "email": "nelsonli@google.com", "time": "Wed Jan 17 07:02:52 2024 +0000" }, "committer": { "name": "Nelson Li", "email": "nelsonli@google.com", "time": "Wed Jan 17 08:00:24 2024 +0000" }, "message": "Make the system-current.txt available for use by /vendor tests\n\nBug: 312324146\nTest: Add apache-http-legacy-system-current.txt to the Android.bp\nChange-Id: I343af1bd9b20da2000cf5fcfef8beef40db7dd58\n" }, { "commit": "50309ea75c3e4650af0d86f5ffb85bfd6f503aed", "tree": "3730e8e911c314cc7a8d562fdab0fd319756daa5", "parents": [ "de5801252f2a7feec6f51bcb2790bfe932d25adc", "f272e21eb9c896d3626bbe033396a6765dc00a1f" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Oct 13 08:29:00 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 13 08:29:00 2023 +0000" }, "message": "[automerger skipped] Add additional overriding methods to signature files am: f272e21eb9 -s ours\n\nam skip reason: Merged-In I301ec87464be4fa89380b2ccb8b8b305676ec67f with SHA-1 6131efddce is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-http/+/25034606\n\nChange-Id: I408782de0f256ef8267c336641c0da2c6093902e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f272e21eb9c896d3626bbe033396a6765dc00a1f", "tree": "3730e8e911c314cc7a8d562fdab0fd319756daa5", "parents": [ "827b162acb617de0199f90bdd9150011adbe8e72" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Oct 12 01:35:02 2023 +0000" }, "committer": { "name": "Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Thu Oct 12 22:04:17 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\n(cherry picked from https://android-review.googlesource.com/q/commit:6131efddce0957c0240b9bf4331e021540a3ac4a)\nMerged-In: I301ec87464be4fa89380b2ccb8b8b305676ec67f\nChange-Id: I301ec87464be4fa89380b2ccb8b8b305676ec67f\n" }, { "commit": "de5801252f2a7feec6f51bcb2790bfe932d25adc", "tree": "3730e8e911c314cc7a8d562fdab0fd319756daa5", "parents": [ "d532f1cd01018a05b624079bf4e457261a4a23ca", "827b162acb617de0199f90bdd9150011adbe8e72" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Thu Oct 12 16:40:47 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 12 16:40:47 2023 +0000" }, "message": "[automerger skipped] Prepare for keeping concrete overrides of abstract methods am: 827b162acb -s ours\n\nam skip reason: Merged-In Ia4e7977ae8cfefa15612b45dca33fd6007c27e5d with SHA-1 837aa6961b is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-http/+/25029506\n\nChange-Id: Ib32c943c4c349f65a6589ff439d163fb48cedb93\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d532f1cd01018a05b624079bf4e457261a4a23ca", "tree": "3730e8e911c314cc7a8d562fdab0fd319756daa5", "parents": [ "9f7472c69279d111f344974bdbe44955d01d3e66", "98d79fb0bbbda143b50c0f064d827e7ae891e9dc" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Thu Oct 12 16:05:03 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 12 16:05:03 2023 +0000" }, "message": "Merge \"Add additional overriding methods to signature files\" into main am: ea1cd97bae am: f9ac939eff am: ad549fec34 am: d36200aded am: 98d79fb0bb\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/apache-http/+/2784259\n\nChange-Id: I69bcbc26fb0759d9d1c1f81d2ab5e5979bb47246\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "98d79fb0bbbda143b50c0f064d827e7ae891e9dc", "tree": "3730e8e911c314cc7a8d562fdab0fd319756daa5", "parents": [ "4c9cc198f0874d7c1058e84c80e40d99a59c5733", "d36200aded803807c60b9fb2459eb5c38cca93ce" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Thu Oct 12 15:33:38 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 12 15:33:38 2023 +0000" }, "message": "Merge \"Add additional overriding methods to signature files\" into main am: ea1cd97bae am: f9ac939eff am: ad549fec34 am: d36200aded\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/apache-http/+/2784259\n\nChange-Id: Ifef7092644b8f4d36b389ab5dc0935b06aaf2f47\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d36200aded803807c60b9fb2459eb5c38cca93ce", "tree": "3730e8e911c314cc7a8d562fdab0fd319756daa5", "parents": [ "cdcabb3dc6f841eed7b179c76b2bdc69e5d60c9c", "ad549fec3423ec19548eed2d71d0f796081862f6" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Thu Oct 12 14:58:00 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 12 14:58:00 2023 +0000" }, "message": "Merge \"Add additional overriding methods to signature files\" into main am: ea1cd97bae am: f9ac939eff am: ad549fec34\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/apache-http/+/2784259\n\nChange-Id: I5f2af7ee8a4bf3637f425d616d4995310b4c7e09\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ad549fec3423ec19548eed2d71d0f796081862f6", "tree": "3730e8e911c314cc7a8d562fdab0fd319756daa5", "parents": [ "886f90f3f22a25bc8072b6a6df90a3ed59c9ca6d", "f9ac939effea29e33bc9dedb6979aeeca3958124" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Thu Oct 12 14:27:19 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 12 14:27:19 2023 +0000" }, "message": "Merge \"Add additional overriding methods to signature files\" into main am: ea1cd97bae am: f9ac939eff\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/apache-http/+/2784259\n\nChange-Id: I9061d4e5f2b983c12b6616b4d58e015d915527d6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f9ac939effea29e33bc9dedb6979aeeca3958124", "tree": "3730e8e911c314cc7a8d562fdab0fd319756daa5", "parents": [ "e49ecec3de1ba93b695e1265affea1b113e5a1f6", "ea1cd97bae6827bfa9d5733d9f2e55fde634f964" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Thu Oct 12 13:55:09 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 12 13:55:09 2023 +0000" }, "message": "Merge \"Add additional overriding methods to signature files\" into main am: ea1cd97bae\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/apache-http/+/2784259\n\nChange-Id: I8b4cc98a416d0a7dffd76ec39a616660ac89591f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ea1cd97bae6827bfa9d5733d9f2e55fde634f964", "tree": "3730e8e911c314cc7a8d562fdab0fd319756daa5", "parents": [ "dde1797b4add8591f327259e5e4f5bee061d7639", "6131efddce0957c0240b9bf4331e021540a3ac4a" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Thu Oct 12 13:23:56 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Oct 12 13:23:56 2023 +0000" }, "message": "Merge \"Add additional overriding methods to signature files\" into main" }, { "commit": "827b162acb617de0199f90bdd9150011adbe8e72", "tree": "3b99c1ba9ca1a0d69e724a267ed8926c1358529d", "parents": [ "0bbd5408982f09c7e290a4aa528e1bb992ddca73" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue Oct 10 17:51:53 2023 +0100" }, "committer": { "name": "Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Thu Oct 12 08:54:14 2023 +0000" }, "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\n(cherry picked from https://android-review.googlesource.com/q/commit:837aa6961b503df199734b8928ad1d913dc94a5b)\nMerged-In: Ia4e7977ae8cfefa15612b45dca33fd6007c27e5d\nChange-Id: Ia4e7977ae8cfefa15612b45dca33fd6007c27e5d\n" }, { "commit": "6131efddce0957c0240b9bf4331e021540a3ac4a", "tree": "3730e8e911c314cc7a8d562fdab0fd319756daa5", "parents": [ "dde1797b4add8591f327259e5e4f5bee061d7639" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Oct 12 01:35:02 2023 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Oct 12 02:18:55 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: I301ec87464be4fa89380b2ccb8b8b305676ec67f\n" }, { "commit": "9f7472c69279d111f344974bdbe44955d01d3e66", "tree": "3b99c1ba9ca1a0d69e724a267ed8926c1358529d", "parents": [ "0bbd5408982f09c7e290a4aa528e1bb992ddca73", "4c9cc198f0874d7c1058e84c80e40d99a59c5733" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Oct 12 00:07:45 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 12 00:07:45 2023 +0000" }, "message": "Merge \"Prepare for keeping concrete overrides of abstract methods\" into main am: dde1797b4a am: e49ecec3de am: 886f90f3f2 am: cdcabb3dc6 am: 4c9cc198f0\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/apache-http/+/2781068\n\nChange-Id: Id04db5d4064b87c1573aecf4bbb08ac4a54ae3e6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4c9cc198f0874d7c1058e84c80e40d99a59c5733", "tree": "3b99c1ba9ca1a0d69e724a267ed8926c1358529d", "parents": [ "0bbd5408982f09c7e290a4aa528e1bb992ddca73", "cdcabb3dc6f841eed7b179c76b2bdc69e5d60c9c" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Wed Oct 11 22:32:31 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 11 22:32:31 2023 +0000" }, "message": "Merge \"Prepare for keeping concrete overrides of abstract methods\" into main am: dde1797b4a am: e49ecec3de am: 886f90f3f2 am: cdcabb3dc6\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/apache-http/+/2781068\n\nChange-Id: I270015864b7fa5c5982cbe8c4af0c15df2ec327f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cdcabb3dc6f841eed7b179c76b2bdc69e5d60c9c", "tree": "3b99c1ba9ca1a0d69e724a267ed8926c1358529d", "parents": [ "0bbd5408982f09c7e290a4aa528e1bb992ddca73", "886f90f3f22a25bc8072b6a6df90a3ed59c9ca6d" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Wed Oct 11 21:58:48 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 11 21:58:48 2023 +0000" }, "message": "Merge \"Prepare for keeping concrete overrides of abstract methods\" into main am: dde1797b4a am: e49ecec3de am: 886f90f3f2\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/apache-http/+/2781068\n\nChange-Id: Id4ce24c3e8aea8bb0a5f2545162de910283f161d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "886f90f3f22a25bc8072b6a6df90a3ed59c9ca6d", "tree": "3b99c1ba9ca1a0d69e724a267ed8926c1358529d", "parents": [ "0bbd5408982f09c7e290a4aa528e1bb992ddca73", "e49ecec3de1ba93b695e1265affea1b113e5a1f6" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Wed Oct 11 21:26:05 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 11 21:26:05 2023 +0000" }, "message": "Merge \"Prepare for keeping concrete overrides of abstract methods\" into main am: dde1797b4a am: e49ecec3de\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/apache-http/+/2781068\n\nChange-Id: I0e5de178088b9f3b06dddd40fc6a31b3428bec6d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e49ecec3de1ba93b695e1265affea1b113e5a1f6", "tree": "3b99c1ba9ca1a0d69e724a267ed8926c1358529d", "parents": [ "0bbd5408982f09c7e290a4aa528e1bb992ddca73", "dde1797b4add8591f327259e5e4f5bee061d7639" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Wed Oct 11 21:09:37 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 11 21:09:37 2023 +0000" }, "message": "Merge \"Prepare for keeping concrete overrides of abstract methods\" into main am: dde1797b4a\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/apache-http/+/2781068\n\nChange-Id: I24176820ad8d58251c589c6baafe1674f70ba458\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "dde1797b4add8591f327259e5e4f5bee061d7639", "tree": "3b99c1ba9ca1a0d69e724a267ed8926c1358529d", "parents": [ "0bbd5408982f09c7e290a4aa528e1bb992ddca73", "837aa6961b503df199734b8928ad1d913dc94a5b" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Wed Oct 11 21:02:17 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Oct 11 21:02:17 2023 +0000" }, "message": "Merge \"Prepare for keeping concrete overrides of abstract methods\" into main" }, { "commit": "837aa6961b503df199734b8928ad1d913dc94a5b", "tree": "3b99c1ba9ca1a0d69e724a267ed8926c1358529d", "parents": [ "0bbd5408982f09c7e290a4aa528e1bb992ddca73" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue Oct 10 17:51:53 2023 +0100" }, "committer": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue Oct 10 17:51:53 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: Ia4e7977ae8cfefa15612b45dca33fd6007c27e5d\n" }, { "commit": "0bbd5408982f09c7e290a4aa528e1bb992ddca73", "tree": "c0ef7660bac140abe46b991b8a779138961e5552", "parents": [ "70490a7ca17bdddb6d920d53e512fb8596acb473", "9373c1cf621baaed96450e696ee49f29ffe82de3" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Sat Jun 05 00:55:19 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Jun 05 00:55:19 2021 +0000" }, "message": "[automerger skipped] Set dist_group: \"android\" for external/apache-http java_sdk_libraries am: 199612e35c am: 9373c1cf62 -s ours\n\nam skip reason: Merged-In I745a89015e20510bfbe63ae0930523f86bf96f1b with SHA-1 199612e35c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-http/+/14845236\n\nChange-Id: I1bb321af82a378a6627015c985d69b7bdb0ec793\n" }, { "commit": "70490a7ca17bdddb6d920d53e512fb8596acb473", "tree": "c0ef7660bac140abe46b991b8a779138961e5552", "parents": [ "7f7051921ed922a7596f97287ed9121960c5c79f", "2d8e5e0ab8954d9bbfae4b437e4513e21aad5103" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Jun 04 18:27:36 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 04 18:27:36 2021 +0000" }, "message": "[automerger skipped] Set dist_group: \"android\" for external/apache-http java_sdk_libraries am: 199612e35c -s ours am: 8ffaef845c -s ours am: 2d8e5e0ab8 -s ours\n\nam skip reason: Merged-In I745a89015e20510bfbe63ae0930523f86bf96f1b with SHA-1 199612e35c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-http/+/14845236\n\nChange-Id: I170db17d38f7b9115a0fff99417465fab3bce5d6\n" }, { "commit": "7f7051921ed922a7596f97287ed9121960c5c79f", "tree": "c0ef7660bac140abe46b991b8a779138961e5552", "parents": [ "54a1ed1f8db8367f68dc5c75a1a1daca3f97770e", "33874ef696959bb5372003eb12c681034e161652" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Jun 04 18:27:09 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 04 18:27:09 2021 +0000" }, "message": "[automerger skipped] Set dist_group: \"android\" for external/apache-http java_sdk_libraries am: 199612e35c am: f4411f95ba -s ours am: 33874ef696 -s ours\n\nam skip reason: Merged-In I745a89015e20510bfbe63ae0930523f86bf96f1b with SHA-1 dfaf07afcd is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-http/+/14845236\n\nChange-Id: I96c2ba520756269835aa424bf8d73272fe7b5500\n" }, { "commit": "2d8e5e0ab8954d9bbfae4b437e4513e21aad5103", "tree": "c0ef7660bac140abe46b991b8a779138961e5552", "parents": [ "33874ef696959bb5372003eb12c681034e161652", "8ffaef845cd55a083c120a5599234ceb25ebfe18" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Jun 04 18:14:04 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 04 18:14:04 2021 +0000" }, "message": "[automerger skipped] Set dist_group: \"android\" for external/apache-http java_sdk_libraries am: 199612e35c -s ours am: 8ffaef845c -s ours\n\nam skip reason: Merged-In I745a89015e20510bfbe63ae0930523f86bf96f1b with SHA-1 199612e35c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-http/+/14845236\n\nChange-Id: I64eeaf8a220b543794904c82b005e1a9035f441a\n" }, { "commit": "33874ef696959bb5372003eb12c681034e161652", "tree": "c0ef7660bac140abe46b991b8a779138961e5552", "parents": [ "f4bc10d24fd34bb21ef3d331beca3a9e468a287b", "f4411f95ba531420f6e26545fe5d94f337fe8de1" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Jun 04 18:12:04 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 04 18:12:04 2021 +0000" }, "message": "[automerger skipped] Set dist_group: \"android\" for external/apache-http java_sdk_libraries am: 199612e35c am: f4411f95ba -s ours\n\nam skip reason: Merged-In I745a89015e20510bfbe63ae0930523f86bf96f1b with SHA-1 dfaf07afcd is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-http/+/14845236\n\nChange-Id: I3bec7e5918bdd2aa7ecbfee60f58ad74396eea11\n" }, { "commit": "f4411f95ba531420f6e26545fe5d94f337fe8de1", "tree": "c0ef7660bac140abe46b991b8a779138961e5552", "parents": [ "28fc3fbd2f7770f7002b8a59d48918dc848a7e35", "199612e35cad9fcd4caeaa882f2ff5a14f4c78a3" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Jun 04 17:51:18 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 04 17:51:18 2021 +0000" }, "message": "Set dist_group: \"android\" for external/apache-http java_sdk_libraries am: 199612e35c\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-http/+/14845236\n\nChange-Id: I2a77c793291e14aa75582c6fe7b43e0577d46883\n" }, { "commit": "9373c1cf621baaed96450e696ee49f29ffe82de3", "tree": "c0ef7660bac140abe46b991b8a779138961e5552", "parents": [ "8839b3027fa35cac5b3b1afa63648bf4101f4397", "199612e35cad9fcd4caeaa882f2ff5a14f4c78a3" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Jun 04 17:49:34 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 04 17:49:34 2021 +0000" }, "message": "Set dist_group: \"android\" for external/apache-http java_sdk_libraries am: 199612e35c\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-http/+/14845236\n\nChange-Id: I05395035ee70e0a22e8f9cb2769fd0a97b2c0bbd\n" }, { "commit": "8ffaef845cd55a083c120a5599234ceb25ebfe18", "tree": "c0ef7660bac140abe46b991b8a779138961e5552", "parents": [ "e62ccf69d802a0efd7c2ef1525921ce1c4768939", "199612e35cad9fcd4caeaa882f2ff5a14f4c78a3" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Jun 04 17:49:30 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 04 17:49:30 2021 +0000" }, "message": "[automerger skipped] Set dist_group: \"android\" for external/apache-http java_sdk_libraries am: 199612e35c -s ours\n\nam skip reason: Merged-In I745a89015e20510bfbe63ae0930523f86bf96f1b with SHA-1 dfaf07afcd is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-http/+/14845236\n\nChange-Id: Ie4949fb9b1e0e6f1b509576541dcbe5e66dc202e\n" }, { "commit": "199612e35cad9fcd4caeaa882f2ff5a14f4c78a3", "tree": "c0ef7660bac140abe46b991b8a779138961e5552", "parents": [ "28fc3fbd2f7770f7002b8a59d48918dc848a7e35" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon May 10 10:47:29 2021 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Jun 04 09:21:41 2021 -0700" }, "message": "Set dist_group: \"android\" for external/apache-http java_sdk_libraries\n\ndist_group replaces owner and the default is going to change, set it\nto the current default \"android\" for external/apache-http\njava_sdk_libraries.\n\nBug: 186723288\nTest: m checkbuild\nChange-Id: I745a89015e20510bfbe63ae0930523f86bf96f1b\nMerged-In: I745a89015e20510bfbe63ae0930523f86bf96f1b\n(cherry picked from commit dfaf07afcd1b6e25f09b6a5169f2dbada4e1f20f)\n" }, { "commit": "54a1ed1f8db8367f68dc5c75a1a1daca3f97770e", "tree": "c0ef7660bac140abe46b991b8a779138961e5552", "parents": [ "17101fb94d103d9cdbc73742ee4df9d21cbc04b3", "f4bc10d24fd34bb21ef3d331beca3a9e468a287b" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 04 10:34:02 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 04 10:34:02 2021 +0000" }, "message": "Merge \"Set dist_group: \"android\" for external/apache-http java_sdk_libraries\" am: f176328d3a am: 5e29f9dc62 am: e62ccf69d8 am: f4bc10d24f\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/apache-http/+/1701526\n\nChange-Id: Id9db867015a9c82945e2bfefb3bf11d8b8899dd3\n" }, { "commit": "f4bc10d24fd34bb21ef3d331beca3a9e468a287b", "tree": "c0ef7660bac140abe46b991b8a779138961e5552", "parents": [ "28fc3fbd2f7770f7002b8a59d48918dc848a7e35", "e62ccf69d802a0efd7c2ef1525921ce1c4768939" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 04 10:21:36 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 04 10:21:36 2021 +0000" }, "message": "Merge \"Set dist_group: \"android\" for external/apache-http java_sdk_libraries\" am: f176328d3a am: 5e29f9dc62 am: e62ccf69d8\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/apache-http/+/1701526\n\nChange-Id: I9772eefca3540cd02aca2c737d221e845a79569b\n" }, { "commit": "e62ccf69d802a0efd7c2ef1525921ce1c4768939", "tree": "c0ef7660bac140abe46b991b8a779138961e5552", "parents": [ "28fc3fbd2f7770f7002b8a59d48918dc848a7e35", "5e29f9dc62648bb74c6e5f311d9a72a87d0503c2" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 04 09:58:13 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 04 09:58:13 2021 +0000" }, "message": "Merge \"Set dist_group: \"android\" for external/apache-http java_sdk_libraries\" am: f176328d3a am: 5e29f9dc62\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/apache-http/+/1701526\n\nChange-Id: I0e1a85b8c904743c5b93c65dab455b6c4cd9628a\n" }, { "commit": "5e29f9dc62648bb74c6e5f311d9a72a87d0503c2", "tree": "c0ef7660bac140abe46b991b8a779138961e5552", "parents": [ "0dc2775c3cb7daf8f3d43ab4c15fe17537cb6fed", "f176328d3a40ec684abf4592bb1ae43ce4422f85" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 04 09:44:13 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 04 09:44:13 2021 +0000" }, "message": "Merge \"Set dist_group: \"android\" for external/apache-http java_sdk_libraries\" am: f176328d3a\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/apache-http/+/1701526\n\nChange-Id: I9431ddd4d2acaa782bc066248a311d55489a71e7\n" }, { "commit": "f176328d3a40ec684abf4592bb1ae43ce4422f85", "tree": "c0ef7660bac140abe46b991b8a779138961e5552", "parents": [ "0dc2775c3cb7daf8f3d43ab4c15fe17537cb6fed", "dfaf07afcd1b6e25f09b6a5169f2dbada4e1f20f" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 04 09:18:17 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jun 04 09:18:17 2021 +0000" }, "message": "Merge \"Set dist_group: \"android\" for external/apache-http java_sdk_libraries\"" }, { "commit": "17101fb94d103d9cdbc73742ee4df9d21cbc04b3", "tree": "338fc891052d885d3fc3bfa119ef531a785c21cb", "parents": [ "6c0b7e6a044fb835530b182431c98b7a729096ac", "8839b3027fa35cac5b3b1afa63648bf4101f4397" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jun 02 16:48:49 2021 +0000" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jun 02 16:48:49 2021 +0000" }, "message": "Merge sc-mainline-prod\n\nBug: 189946434\nChange-Id: If1104f9dac53a7a3b9a77c66fadd272f2b8614d3\n" }, { "commit": "dfaf07afcd1b6e25f09b6a5169f2dbada4e1f20f", "tree": "c0ef7660bac140abe46b991b8a779138961e5552", "parents": [ "0dc2775c3cb7daf8f3d43ab4c15fe17537cb6fed" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon May 10 10:47:29 2021 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 01 14:27:59 2021 -0700" }, "message": "Set dist_group: \"android\" for external/apache-http java_sdk_libraries\n\ndist_group replaces owner and the default is going to change, set it\nto the current default \"android\" for external/apache-http\njava_sdk_libraries.\n\nBug: 186723288\nTest: m checkbuild\nChange-Id: I745a89015e20510bfbe63ae0930523f86bf96f1b\n" }, { "commit": "8839b3027fa35cac5b3b1afa63648bf4101f4397", "tree": "338fc891052d885d3fc3bfa119ef531a785c21cb", "parents": [ "bf7e429efdc03345198ba7d2d607876a44e88729", "28fc3fbd2f7770f7002b8a59d48918dc848a7e35" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Feb 16 23:17:54 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 23:17:54 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to external/apache-http\" am: 547e8a0103 am: 0dc2775c3c am: e338041693 am: 28fc3fbd2f\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/apache-http/+/1588915\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I2161d9841b9eb2a373e848a729511e16915076a2\n" }, { "commit": "6c0b7e6a044fb835530b182431c98b7a729096ac", "tree": "338fc891052d885d3fc3bfa119ef531a785c21cb", "parents": [ "bf7e429efdc03345198ba7d2d607876a44e88729", "28fc3fbd2f7770f7002b8a59d48918dc848a7e35" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Feb 16 23:17:26 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 23:17:26 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to external/apache-http\" am: 547e8a0103 am: 0dc2775c3c am: e338041693 am: 28fc3fbd2f\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/apache-http/+/1588915\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Ia1d1ac292635fc2e29438e5cadcb88d6727e6982\n" }, { "commit": "28fc3fbd2f7770f7002b8a59d48918dc848a7e35", "tree": "338fc891052d885d3fc3bfa119ef531a785c21cb", "parents": [ "bf7e429efdc03345198ba7d2d607876a44e88729", "e3380416939f2aebe708050a385e37e0a8098182" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Feb 16 23:02:21 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 23:02:21 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to external/apache-http\" am: 547e8a0103 am: 0dc2775c3c am: e338041693\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/apache-http/+/1588915\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I71dc388fef7b64011ac07e6d5d99d22c22db9e58\n" }, { "commit": "e3380416939f2aebe708050a385e37e0a8098182", "tree": "338fc891052d885d3fc3bfa119ef531a785c21cb", "parents": [ "3b4799b0797cec05389444dc500388a280485a20", "0dc2775c3cb7daf8f3d43ab4c15fe17537cb6fed" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Feb 16 22:23:24 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 22:23:24 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to external/apache-http\" am: 547e8a0103 am: 0dc2775c3c\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/apache-http/+/1588915\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I805a59847f4aa313a0916203a6628bbde2a455ab\n" }, { "commit": "0dc2775c3cb7daf8f3d43ab4c15fe17537cb6fed", "tree": "338fc891052d885d3fc3bfa119ef531a785c21cb", "parents": [ "3b4799b0797cec05389444dc500388a280485a20", "547e8a01031ca126e149ac60fd4157fbcec6fbca" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Feb 16 21:45:51 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 21:45:51 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to external/apache-http\" am: 547e8a0103\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/apache-http/+/1588915\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I07406d713dc0de0992b0f3b37980d66853cbd570\n" }, { "commit": "547e8a01031ca126e149ac60fd4157fbcec6fbca", "tree": "338fc891052d885d3fc3bfa119ef531a785c21cb", "parents": [ "3b4799b0797cec05389444dc500388a280485a20", "d894d54c616747ecff590de4a261145367bd9936" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Feb 16 21:13:06 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Feb 16 21:13:06 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to external/apache-http\"" }, { "commit": "d894d54c616747ecff590de4a261145367bd9936", "tree": "338fc891052d885d3fc3bfa119ef531a785c21cb", "parents": [ "3b4799b0797cec05389444dc500388a280485a20" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 12 14:43:06 2021 -0800" }, "committer": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 12 14:43:06 2021 -0800" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to external/apache-http\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: Iad980bb9c1e24745f564d550083bc37229552f62\n" }, { "commit": "bf7e429efdc03345198ba7d2d607876a44e88729", "tree": "33c0266734c3a9f155fd6e064301357f2e467f27", "parents": [ "2a23fb3341adfd4e517e960c80e232b29bb5ed8f", "510567b557e5d42e892a633a986c71565766c87e" ], "author": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Wed Sep 16 19:02:13 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 16 19:02:13 2020 +0000" }, "message": "[automerger skipped] Fix ReferencesHidden issues in apache http am: 510567b557 -s ours\n\nam skip reason: Change-Id I8e02af533be5cd0eccad0d9eed0a85c9b1b9b3e8 with SHA-1 2bd03503ee is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-http/+/12402737\n\nChange-Id: I68d29edfb796ea57ccd41da82158f1d1646c4830\n" }, { "commit": "2a23fb3341adfd4e517e960c80e232b29bb5ed8f", "tree": "33c0266734c3a9f155fd6e064301357f2e467f27", "parents": [ "7b592e4cb4af7e500698e9e8309f72dad28879e4", "49e305707976190d83b1f49f997cf7948647dde8" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Sun Sep 13 02:24:43 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Sep 13 02:24:43 2020 +0000" }, "message": "[automerger skipped] Add lint-baseline.txt am: 426077d091 am: 49e3057079 -s ours\n\nam skip reason: Change-Id I1009af980a99beab5859474435a80e27288d6df1 with SHA-1 426077d091 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-http/+/11440728\n\nChange-Id: I8a73c053a7a8e7a77b08c19d2d75a475cb5dbbd0\n" }, { "commit": "510567b557e5d42e892a633a986c71565766c87e", "tree": "43c17fdc63602ca0dbd723ccbae343679f7a0584", "parents": [ "49e305707976190d83b1f49f997cf7948647dde8" ], "author": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Tue Jun 23 16:53:15 2020 -0700" }, "committer": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Wed Aug 26 10:21:40 2020 -0700" }, "message": "Fix ReferencesHidden issues in apache http\n\nWe had RequestQueue had several public APIs that used\nhidden Connection and Request classes. This made these\nimpossible to call for developers and in fact stubs would\nnot even compile without a metalava workaround for this.\n\nThis CL remove the disabling of ReferencesHidden as ignoring\nReferencesHidden leads to pulling in hidden classes\ninto API surfaces which is always a bug. Removing hiding here\nso this option to suppress can be removed completely.\n\nBug: 146727827\nExempt-From-Owner-Approval: Cherry-picking from master\nTest: make -j -\u003e passes\nChange-Id: I8e02af533be5cd0eccad0d9eed0a85c9b1b9b3e8\nMerged-in: I8e02af533be5cd0eccad0d9eed0a85c9b1b9b3e8\n" }, { "commit": "7b592e4cb4af7e500698e9e8309f72dad28879e4", "tree": "33c0266734c3a9f155fd6e064301357f2e467f27", "parents": [ "899ae55354cec9304f5d893d46d99f073d779f48", "3b4799b0797cec05389444dc500388a280485a20" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Jun 27 01:45:32 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Jun 27 01:45:32 2020 +0000" }, "message": "Merge \"Fix ReferencesHidden issues in apache http\" am: 55b5ba17af am: bd2a970763 am: 57aa3fda81 am: 3a340db0c8 am: 3b4799b079\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/apache-http/+/1348243\n\nChange-Id: Ib5e8dcfdd48961ce40ba0a04ed933a60ec9b5c61\n" }, { "commit": "3b4799b0797cec05389444dc500388a280485a20", "tree": "33c0266734c3a9f155fd6e064301357f2e467f27", "parents": [ "b0d7fca22de18680701a8ec29076e04a72264b25", "3a340db0c80b466bd32b55a8da3ad3a154c786bd" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jun 25 19:51:28 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 25 19:51:28 2020 +0000" }, "message": "Merge \"Fix ReferencesHidden issues in apache http\" am: 55b5ba17af am: bd2a970763 am: 57aa3fda81 am: 3a340db0c8\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/apache-http/+/1348243\n\nChange-Id: Ie9c6061bdb8a6f5b9b4bb7ba6ada9ebebff89c7c\n" }, { "commit": "3a340db0c80b466bd32b55a8da3ad3a154c786bd", "tree": "33c0266734c3a9f155fd6e064301357f2e467f27", "parents": [ "4e878869acb7ecb3995234f11a783f4821fca09b", "57aa3fda811ec5d0b63bdee4d809e921b6e904e7" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jun 25 19:44:48 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 25 19:44:48 2020 +0000" }, "message": "Merge \"Fix ReferencesHidden issues in apache http\" am: 55b5ba17af am: bd2a970763 am: 57aa3fda81\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/apache-http/+/1348243\n\nChange-Id: I14d4b7642abd8b3f678179f74ac626ff0199f0a2\n" }, { "commit": "57aa3fda811ec5d0b63bdee4d809e921b6e904e7", "tree": "33c0266734c3a9f155fd6e064301357f2e467f27", "parents": [ "b9c93abb3eb901fb05d721cd8e393c8408d5d53f", "bd2a970763d0400f7950c14b9ab2305764824735" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jun 25 19:31:01 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 25 19:31:01 2020 +0000" }, "message": "Merge \"Fix ReferencesHidden issues in apache http\" am: 55b5ba17af am: bd2a970763\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/apache-http/+/1348243\n\nChange-Id: I035dba2a99a0944e23a07c295cb1b8f9fbbe5992\n" }, { "commit": "bd2a970763d0400f7950c14b9ab2305764824735", "tree": "33c0266734c3a9f155fd6e064301357f2e467f27", "parents": [ "d176cfc822b87662e164976f81aad9f15fc52833", "55b5ba17afdc82151d0a1887dd44714f89c7d963" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jun 25 19:18:54 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 25 19:18:54 2020 +0000" }, "message": "Merge \"Fix ReferencesHidden issues in apache http\" am: 55b5ba17af\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/apache-http/+/1348243\n\nChange-Id: I31da5bc83ddc25dd416bad909841f4dfdb1140de\n" }, { "commit": "55b5ba17afdc82151d0a1887dd44714f89c7d963", "tree": "33c0266734c3a9f155fd6e064301357f2e467f27", "parents": [ "d176cfc822b87662e164976f81aad9f15fc52833", "2bd03503ee9f03971d9e3def2bb319511c5feb02" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jun 25 19:06:57 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jun 25 19:06:57 2020 +0000" }, "message": "Merge \"Fix ReferencesHidden issues in apache http\"" }, { "commit": "2bd03503ee9f03971d9e3def2bb319511c5feb02", "tree": "33c0266734c3a9f155fd6e064301357f2e467f27", "parents": [ "d176cfc822b87662e164976f81aad9f15fc52833" ], "author": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Tue Jun 23 16:53:15 2020 -0700" }, "committer": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Wed Jun 24 16:34:47 2020 -0700" }, "message": "Fix ReferencesHidden issues in apache http\n\nWe had RequestQueue had several public APIs that used\nhidden Connection and Request classes. This made these\nimpossible to call for developers and in fact stubs would\nnot even compile without a metalava workaround for this.\n\nThis CL remove the disabling of ReferencesHidden as ignoring\nReferencesHidden leads to pulling in hidden classes\ninto API surfaces which is always a bug. Removing hiding here\nso this option to suppress can be removed completely.\n\nTest: make -j -\u003e passes\nChange-Id: I8e02af533be5cd0eccad0d9eed0a85c9b1b9b3e8\n" }, { "commit": "899ae55354cec9304f5d893d46d99f073d779f48", "tree": "487ad39e58a77b39c21d9d0613be11673b1ad050", "parents": [ "dd38f777bd4385ec5c1a8a152497be248c03f9a2", "b0d7fca22de18680701a8ec29076e04a72264b25" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue May 12 14:16:22 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 12 14:16:22 2020 +0000" }, "message": "[automerger skipped] Add lint-baseline.txt am: 426077d091 -s ours am: b9c93abb3e -s ours am: 4e878869ac -s ours am: b0d7fca22d -s ours\n\nam skip reason: Change-Id I1009af980a99beab5859474435a80e27288d6df1 with SHA-1 426077d091 is in history\n\nChange-Id: Ib1c68c116dbe3ed1f487943395075b33eb318c4b\n" }, { "commit": "dd38f777bd4385ec5c1a8a152497be248c03f9a2", "tree": "487ad39e58a77b39c21d9d0613be11673b1ad050", "parents": [ "a8704c8f2eadc90aa1a2ac2aac0b014bdc661878", "1b3bde2de4965ed123160e1bcd86225870908c45" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue May 12 14:16:01 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 12 14:16:01 2020 +0000" }, "message": "[automerger skipped] Add lint-baseline.txt am: 426077d091 am: 1d6c204608 am: 3ed8712e12 -s ours am: 1b3bde2de4 -s ours\n\nam skip reason: Change-Id I1009af980a99beab5859474435a80e27288d6df1 with SHA-1 426077d091 is in history\n\nChange-Id: Ia17280928fae8fe44720d23b362416359d70a30f\n" }, { "commit": "a8704c8f2eadc90aa1a2ac2aac0b014bdc661878", "tree": "487ad39e58a77b39c21d9d0613be11673b1ad050", "parents": [ "6ee344fd252c81650f1c803efae005b65cd2a0ff", "6b9ac796fedf0f318b21566126863a0ef67e528a" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue May 12 14:15:21 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 12 14:15:21 2020 +0000" }, "message": "[automerger skipped] Add lint-baseline.txt am: 426077d091 am: 1d6c204608 -s ours am: 6e5deb6344 -s ours am: 6b9ac796fe -s ours\n\nam skip reason: Change-Id I1009af980a99beab5859474435a80e27288d6df1 with SHA-1 35794f3807 is in history\n\nChange-Id: I49927549ee57ff0a1df0fba06aa792b7a5bff8e7\n" }, { "commit": "b0d7fca22de18680701a8ec29076e04a72264b25", "tree": "487ad39e58a77b39c21d9d0613be11673b1ad050", "parents": [ "1b3bde2de4965ed123160e1bcd86225870908c45", "4e878869acb7ecb3995234f11a783f4821fca09b" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue May 12 14:02:30 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 12 14:02:30 2020 +0000" }, "message": "[automerger skipped] Add lint-baseline.txt am: 426077d091 -s ours am: b9c93abb3e -s ours am: 4e878869ac -s ours\n\nam skip reason: Change-Id I1009af980a99beab5859474435a80e27288d6df1 with SHA-1 426077d091 is in history\n\nChange-Id: Ifae2921805aa87ab4722c13ef2bfbebc0eb4e28d\n" }, { "commit": "1b3bde2de4965ed123160e1bcd86225870908c45", "tree": "487ad39e58a77b39c21d9d0613be11673b1ad050", "parents": [ "6b9ac796fedf0f318b21566126863a0ef67e528a", "3ed8712e122625ee614e424e4ab9c8facad1eeed" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue May 12 14:02:17 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 12 14:02:17 2020 +0000" }, "message": "[automerger skipped] Add lint-baseline.txt am: 426077d091 am: 1d6c204608 am: 3ed8712e12 -s ours\n\nam skip reason: Change-Id I1009af980a99beab5859474435a80e27288d6df1 with SHA-1 426077d091 is in history\n\nChange-Id: Id11ee70db0ad6989e979b4bcb7e698c5e01473ae\n" }, { "commit": "6b9ac796fedf0f318b21566126863a0ef67e528a", "tree": "487ad39e58a77b39c21d9d0613be11673b1ad050", "parents": [ "0803e34bb1f5ea499f2fdb45e9e7ad0862edb882", "6e5deb63448b3d767c1f6d9c21295b67027683b3" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue May 12 14:01:49 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 12 14:01:49 2020 +0000" }, "message": "[automerger skipped] Add lint-baseline.txt am: 426077d091 am: 1d6c204608 -s ours am: 6e5deb6344 -s ours\n\nam skip reason: Change-Id I1009af980a99beab5859474435a80e27288d6df1 with SHA-1 35794f3807 is in history\n\nChange-Id: I5725fa9597ca8da244d38bc4c2110e8879d7a8bc\n" }, { "commit": "3ed8712e122625ee614e424e4ab9c8facad1eeed", "tree": "9ebba6676b309c851b39ad491e0e1e89d6affe5e", "parents": [ "c4c11f3f683a1a80157c6ec40df37a1a8e592e43", "1d6c20460825fae69b014384c44a4071abf7b0ac" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue May 12 13:49:28 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 12 13:49:28 2020 +0000" }, "message": "Add lint-baseline.txt am: 426077d091 am: 1d6c204608\n\nChange-Id: I4c014c9aade2da92206a9f8939153bb2b0c8b5dc\n" }, { "commit": "4e878869acb7ecb3995234f11a783f4821fca09b", "tree": "487ad39e58a77b39c21d9d0613be11673b1ad050", "parents": [ "6e5deb63448b3d767c1f6d9c21295b67027683b3", "b9c93abb3eb901fb05d721cd8e393c8408d5d53f" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue May 12 13:49:14 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 12 13:49:14 2020 +0000" }, "message": "[automerger skipped] Add lint-baseline.txt am: 426077d091 -s ours am: b9c93abb3e -s ours\n\nam skip reason: Change-Id I1009af980a99beab5859474435a80e27288d6df1 with SHA-1 426077d091 is in history\n\nChange-Id: Ied5d2b80a636f0070ca149e803dc492868488465\n" }, { "commit": "6e5deb63448b3d767c1f6d9c21295b67027683b3", "tree": "487ad39e58a77b39c21d9d0613be11673b1ad050", "parents": [ "44c2e1f9776099d011484f4f6acf3d4463d6d063", "1d6c20460825fae69b014384c44a4071abf7b0ac" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue May 12 13:48:51 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 12 13:48:51 2020 +0000" }, "message": "[automerger skipped] Add lint-baseline.txt am: 426077d091 am: 1d6c204608 -s ours\n\nam skip reason: Change-Id I1009af980a99beab5859474435a80e27288d6df1 with SHA-1 35794f3807 is in history\n\nChange-Id: I9332974d12fe1a7c6a9f2badbb7cee8870b01b63\n" }, { "commit": "49e305707976190d83b1f49f997cf7948647dde8", "tree": "9ebba6676b309c851b39ad491e0e1e89d6affe5e", "parents": [ "c4c11f3f683a1a80157c6ec40df37a1a8e592e43", "426077d091d46f08690ea29b1f2a51492c5a0e2f" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue May 12 13:31:26 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 12 13:31:26 2020 +0000" }, "message": "Add lint-baseline.txt am: 426077d091\n\nChange-Id: I4a3d35ebd93432b2017731c4efcaad96ba251ca5\n" }, { "commit": "b9c93abb3eb901fb05d721cd8e393c8408d5d53f", "tree": "487ad39e58a77b39c21d9d0613be11673b1ad050", "parents": [ "4acd5ba17824fb6d66f7a5a9335644ee49ca28b5", "426077d091d46f08690ea29b1f2a51492c5a0e2f" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue May 12 13:31:18 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 12 13:31:18 2020 +0000" }, "message": "[automerger skipped] Add lint-baseline.txt am: 426077d091 -s ours\n\nam skip reason: Change-Id I1009af980a99beab5859474435a80e27288d6df1 with SHA-1 35794f3807 is in history\n\nChange-Id: I04e600911c4ba3590d4cf5d3f6a469edd8fd110d\n" }, { "commit": "1d6c20460825fae69b014384c44a4071abf7b0ac", "tree": "9ebba6676b309c851b39ad491e0e1e89d6affe5e", "parents": [ "c4c11f3f683a1a80157c6ec40df37a1a8e592e43", "426077d091d46f08690ea29b1f2a51492c5a0e2f" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue May 12 13:31:13 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 12 13:31:13 2020 +0000" }, "message": "Add lint-baseline.txt am: 426077d091\n\nChange-Id: Ic04554922023f101547cd45623b3f3591cba9f31\n" }, { "commit": "426077d091d46f08690ea29b1f2a51492c5a0e2f", "tree": "9ebba6676b309c851b39ad491e0e1e89d6affe5e", "parents": [ "c4c11f3f683a1a80157c6ec40df37a1a8e592e43" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Sat May 09 14:20:47 2020 +0100" }, "committer": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Mon May 11 20:10:27 2020 +0100" }, "message": "Add lint-baseline.txt\n\nIn preparation for enabling API lint checking on java_sdk_library\nadd a lint-baseline.txt containing all the existing issues.\n\nThe API is old and has been deprecated so there is little to no\nchance that any issues found will be fixed.\n\nBug: 156126315\nTest: m checkapi\nMerged-In: I1009af980a99beab5859474435a80e27288d6df1\nChange-Id: I1009af980a99beab5859474435a80e27288d6df1\n(cherry picked from commit 35794f3807f34c38e702c9485f8adf294c6aa363)\n" }, { "commit": "6ee344fd252c81650f1c803efae005b65cd2a0ff", "tree": "487ad39e58a77b39c21d9d0613be11673b1ad050", "parents": [ "2dd6ace5ceafc623c58d8f7d0b99615672c6adc9", "0803e34bb1f5ea499f2fdb45e9e7ad0862edb882" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon May 11 12:30:45 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon May 11 12:30:45 2020 +0000" }, "message": "Merge \"Add lint-baseline.txt\" am: bd050a696b am: d176cfc822 am: 4acd5ba178 am: 44c2e1f977 am: 0803e34bb1\n\nChange-Id: Ib10f29c9f6dec23c205b92d274a87ce038552d50\n" }, { "commit": "0803e34bb1f5ea499f2fdb45e9e7ad0862edb882", "tree": "487ad39e58a77b39c21d9d0613be11673b1ad050", "parents": [ "8b94a55baac7d1ded40d8823b6548727a8bca7a7", "44c2e1f9776099d011484f4f6acf3d4463d6d063" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon May 11 12:17:02 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon May 11 12:17:02 2020 +0000" }, "message": "Merge \"Add lint-baseline.txt\" am: bd050a696b am: d176cfc822 am: 4acd5ba178 am: 44c2e1f977\n\nChange-Id: Ieaabe65b32c682f9b1fafce73a94838eb289223e\n" }, { "commit": "44c2e1f9776099d011484f4f6acf3d4463d6d063", "tree": "487ad39e58a77b39c21d9d0613be11673b1ad050", "parents": [ "075235473fb6ec6bb00891e1175f648335a982b6", "4acd5ba17824fb6d66f7a5a9335644ee49ca28b5" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon May 11 12:01:48 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon May 11 12:01:48 2020 +0000" }, "message": "Merge \"Add lint-baseline.txt\" am: bd050a696b am: d176cfc822 am: 4acd5ba178\n\nChange-Id: Ie9a59006e33456db4e6896006e4f9944f763cd64\n" }, { "commit": "4acd5ba17824fb6d66f7a5a9335644ee49ca28b5", "tree": "487ad39e58a77b39c21d9d0613be11673b1ad050", "parents": [ "de098f44a7d5c01707a45aae1f699549bd03ab6d", "d176cfc822b87662e164976f81aad9f15fc52833" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon May 11 11:51:14 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon May 11 11:51:14 2020 +0000" }, "message": "Merge \"Add lint-baseline.txt\" am: bd050a696b am: d176cfc822\n\nChange-Id: I669979fbaec480973814e36efdfe7f4388b59843\n" }, { "commit": "d176cfc822b87662e164976f81aad9f15fc52833", "tree": "487ad39e58a77b39c21d9d0613be11673b1ad050", "parents": [ "dc675ca79576096791cda6e9139386025a487dbf", "bd050a696b13d6b8b3e7698fb468996811ac5c3e" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon May 11 11:39:16 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon May 11 11:39:16 2020 +0000" }, "message": "Merge \"Add lint-baseline.txt\" am: bd050a696b\n\nChange-Id: I97fb4a9e27dd0fd49e6d334608c94cca8b1a33f0\n" }, { "commit": "bd050a696b13d6b8b3e7698fb468996811ac5c3e", "tree": "487ad39e58a77b39c21d9d0613be11673b1ad050", "parents": [ "8369056b594bf1e0ea64bb4670b585ba01b24d7f", "35794f3807f34c38e702c9485f8adf294c6aa363" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon May 11 11:16:06 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon May 11 11:16:06 2020 +0000" }, "message": "Merge \"Add lint-baseline.txt\"" }, { "commit": "35794f3807f34c38e702c9485f8adf294c6aa363", "tree": "487ad39e58a77b39c21d9d0613be11673b1ad050", "parents": [ "8369056b594bf1e0ea64bb4670b585ba01b24d7f" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Sat May 09 14:20:47 2020 +0100" }, "committer": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Sun May 10 10:48:30 2020 +0100" }, "message": "Add lint-baseline.txt\n\nIn preparation for enabling API lint checking on java_sdk_library\nadd a lint-baseline.txt containing all the existing issues.\n\nThe API is old and has been deprecated so there is little to no\nchance that any issues found will be fixed.\n\nBug: 156126315\nTest: m checkapi\nChange-Id: I1009af980a99beab5859474435a80e27288d6df1\n" }, { "commit": "2dd6ace5ceafc623c58d8f7d0b99615672c6adc9", "tree": "04d62827d99e7f1ea15e2f9c123448f885055a6e", "parents": [ "c4c11f3f683a1a80157c6ec40df37a1a8e592e43", "8b94a55baac7d1ded40d8823b6548727a8bca7a7" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Apr 29 13:22:39 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 29 13:22:39 2020 +0000" }, "message": "Merge \"Add METADATA to apache-http: Apache2\u003dNOTICE\" am: 8369056b59 am: dc675ca795 am: de098f44a7 am: 075235473f am: 8b94a55baa\n\nChange-Id: I588a9dd7555f4a590d3107d9435c97335c01b7f3\n" }, { "commit": "8b94a55baac7d1ded40d8823b6548727a8bca7a7", "tree": "04d62827d99e7f1ea15e2f9c123448f885055a6e", "parents": [ "c4c11f3f683a1a80157c6ec40df37a1a8e592e43", "075235473fb6ec6bb00891e1175f648335a982b6" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Apr 29 13:04:40 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 29 13:04:40 2020 +0000" }, "message": "Merge \"Add METADATA to apache-http: Apache2\u003dNOTICE\" am: 8369056b59 am: dc675ca795 am: de098f44a7 am: 075235473f\n\nChange-Id: I06315447c9444963ab9aec102b7d2688165080ab\n" }, { "commit": "075235473fb6ec6bb00891e1175f648335a982b6", "tree": "04d62827d99e7f1ea15e2f9c123448f885055a6e", "parents": [ "c4c11f3f683a1a80157c6ec40df37a1a8e592e43", "de098f44a7d5c01707a45aae1f699549bd03ab6d" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Apr 29 12:49:34 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 29 12:49:34 2020 +0000" }, "message": "Merge \"Add METADATA to apache-http: Apache2\u003dNOTICE\" am: 8369056b59 am: dc675ca795 am: de098f44a7\n\nChange-Id: Ica5dd227a1aab3b0f900d560b8872c05146fac16\n" }, { "commit": "de098f44a7d5c01707a45aae1f699549bd03ab6d", "tree": "04d62827d99e7f1ea15e2f9c123448f885055a6e", "parents": [ "c4c11f3f683a1a80157c6ec40df37a1a8e592e43", "dc675ca79576096791cda6e9139386025a487dbf" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Apr 29 12:37:38 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 29 12:37:38 2020 +0000" }, "message": "Merge \"Add METADATA to apache-http: Apache2\u003dNOTICE\" am: 8369056b59 am: dc675ca795\n\nChange-Id: I8324727a36d7d2c8145fc4bd5865da5fb2a2821f\n" }, { "commit": "dc675ca79576096791cda6e9139386025a487dbf", "tree": "04d62827d99e7f1ea15e2f9c123448f885055a6e", "parents": [ "d176d36489b58e75bced0d5234e713abb8c5a847", "8369056b594bf1e0ea64bb4670b585ba01b24d7f" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Apr 29 12:24:52 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 29 12:24:52 2020 +0000" }, "message": "Merge \"Add METADATA to apache-http: Apache2\u003dNOTICE\" am: 8369056b59\n\nChange-Id: Iceb9e9ccd8709e674fd6a08e07329cda306b9fee\n" }, { "commit": "8369056b594bf1e0ea64bb4670b585ba01b24d7f", "tree": "04d62827d99e7f1ea15e2f9c123448f885055a6e", "parents": [ "d176d36489b58e75bced0d5234e713abb8c5a847", "6fabcad70d70a24a6d08d63e4373a0f3b1101c47" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Apr 29 12:12:49 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Apr 29 12:12:49 2020 +0000" }, "message": "Merge \"Add METADATA to apache-http: Apache2\u003dNOTICE\"" }, { "commit": "6fabcad70d70a24a6d08d63e4373a0f3b1101c47", "tree": "04d62827d99e7f1ea15e2f9c123448f885055a6e", "parents": [ "d176d36489b58e75bced0d5234e713abb8c5a847" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Apr 28 09:03:21 2020 -0700" }, "committer": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Apr 28 09:03:21 2020 -0700" }, "message": "Add METADATA to apache-http: Apache2\u003dNOTICE\n\nBug: 68860345\nBug: 69058154\nBug: 151953481\n\nTest: no code changes\nChange-Id: I3fb594a742d4d5b4510b0b6d253508ecb799eb53\n" }, { "commit": "c4c11f3f683a1a80157c6ec40df37a1a8e592e43", "tree": "c27358639718412b78975c5a3db7cd09e9c1b133", "parents": [ "b837b79f8265b49e64807e1810056521f86f01f7", "d176d36489b58e75bced0d5234e713abb8c5a847" ], "author": { "name": "Jiyong Park", "email": "jiyong@google.com", "time": "Wed Oct 30 22:10:07 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 30 22:10:07 2019 -0700" }, "message": "Merge \"Build API stub with less number of source files\" am: e4ec72bee6 am: f0bc40ffae\nam: d176d36489\n\nChange-Id: I67de7ba7cca3b52666299bb3dffe5bf27b5b31f0\n" }, { "commit": "d176d36489b58e75bced0d5234e713abb8c5a847", "tree": "c27358639718412b78975c5a3db7cd09e9c1b133", "parents": [ "f0fcbccb5213557bc61c30c6f22b207b48ca88e7", "f0bc40ffae5d6c11e3ab8d04b77614a110eb0da2" ], "author": { "name": "Jiyong Park", "email": "jiyong@google.com", "time": "Wed Oct 30 22:03:55 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 30 22:03:55 2019 -0700" }, "message": "Merge \"Build API stub with less number of source files\" am: e4ec72bee6\nam: f0bc40ffae\n\nChange-Id: I56a8be4ecfa0913025ace704a861bc3ef1cb264b\n" }, { "commit": "f0bc40ffae5d6c11e3ab8d04b77614a110eb0da2", "tree": "c27358639718412b78975c5a3db7cd09e9c1b133", "parents": [ "7e518e4fab90310745c53084ec346a3275b2ae11", "e4ec72bee68d1ba4846d7ccf7b9acb8bffa189bc" ], "author": { "name": "Jiyong Park", "email": "jiyong@google.com", "time": "Wed Oct 30 21:57:38 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 30 21:57:38 2019 -0700" }, "message": "Merge \"Build API stub with less number of source files\"\nam: e4ec72bee6\n\nChange-Id: Ia4d527ce80183ba6f53b1c363f4185d0628b7e75\n" }, { "commit": "e4ec72bee68d1ba4846d7ccf7b9acb8bffa189bc", "tree": "c27358639718412b78975c5a3db7cd09e9c1b133", "parents": [ "c4b33b7a214ba25d4ca894b9d42bff6f85fe4407", "915083fa0de2dda3f77415dbe91a625b60c81502" ], "author": { "name": "Jiyong Park", "email": "jiyong@google.com", "time": "Thu Oct 31 04:44:27 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Oct 31 04:44:27 2019 +0000" }, "message": "Merge \"Build API stub with less number of source files\"" }, { "commit": "b837b79f8265b49e64807e1810056521f86f01f7", "tree": "8b5f7a1286ab6687622b3347da64ef6ccb398d05", "parents": [ "0af694b6e46f848a7c1d3505c90f3c752bf38d43", "f0fcbccb5213557bc61c30c6f22b207b48ca88e7" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 30 14:43:12 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 30 14:43:12 2019 -0700" }, "message": "[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 7e518e4fab\nam: f0fcbccb52 -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: Ieb9e5f4f844d481e08f24dc3178e0726068818e9\n" }, { "commit": "f0fcbccb5213557bc61c30c6f22b207b48ca88e7", "tree": "8b5f7a1286ab6687622b3347da64ef6ccb398d05", "parents": [ "0020ce6af28b4f2af046cbfa9f045565a7cc6bef", "7e518e4fab90310745c53084ec346a3275b2ae11" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 30 14:21:19 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 30 14:21:19 2019 -0700" }, "message": "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master\nam: 7e518e4fab\n\nChange-Id: Ib976f8d84124c90813ed95e409be20092b3502d9\n" }, { "commit": "7e518e4fab90310745c53084ec346a3275b2ae11", "tree": "8b5f7a1286ab6687622b3347da64ef6ccb398d05", "parents": [ "c4b33b7a214ba25d4ca894b9d42bff6f85fe4407", "0020ce6af28b4f2af046cbfa9f045565a7cc6bef" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 30 11:47:30 2019 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 30 11:47:30 2019 -0700" }, "message": "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master\n\nBug: 142003500\nChange-Id: Ib46dbc7e9bc041503d46e1b52fb66f6116bbabbb\n" }, { "commit": "915083fa0de2dda3f77415dbe91a625b60c81502", "tree": "c27358639718412b78975c5a3db7cd09e9c1b133", "parents": [ "c4b33b7a214ba25d4ca894b9d42bff6f85fe4407" ], "author": { "name": "Jiyong Park", "email": "jiyong@google.com", "time": "Fri Oct 25 14:02:45 2019 +0900" }, "committer": { "name": "Jiyong Park", "email": "jiyong@google.com", "time": "Wed Oct 30 13:25:33 2019 +0900" }, "message": "Build API stub with less number of source files\n\nThe metalava fix 09094fc5e566a380b7aa1a4c3948ac66cebc0aba allows us to\nnot include source files having class definitions that are referenced by\nprivate constructors of the API classes.\n\nRemoving the now uncessary source files from the input list so that\nmetalava can run faster.\n\nBug: 141149570\nTest: m\nChange-Id: I8d26acb3c6993fa0cf11e7b826a0804ec24b9cb8\n" }, { "commit": "0af694b6e46f848a7c1d3505c90f3c752bf38d43", "tree": "8b5f7a1286ab6687622b3347da64ef6ccb398d05", "parents": [ "3f679a4a3e1b5c46fd4f332b519dadde746a2074", "0020ce6af28b4f2af046cbfa9f045565a7cc6bef" ], "author": { "name": "Jiyong Park", "email": "jiyong@google.com", "time": "Sun Sep 15 04:46:39 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Sep 15 04:46:39 2019 -0700" }, "message": "Merge \"Use filegroup\" am: f3ffd568ef am: c4b33b7a21 am: 6afa5d637c\nam: 0020ce6af2\n\nChange-Id: Ifa0b065202dda7f46e0477c52ee12da237337122\n" } ], "next": "0020ce6af28b4f2af046cbfa9f045565a7cc6bef" }