)]}' { "log": [ { "commit": "0ac9a9daea5cce2e775d5da949508593e2ee9206", "tree": "84e21b3cdd579cb36a4c3d775f1037e005df74a2", "parents": [ "7ca7786d579d5cc3eb54947e8e0670acae4ff7df", "2ef92f885cb414c650de27b8963a5612b922b91e" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Apr 30 02:10:39 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 30 02:10:39 2024 +0000" }, "message": "[automerger skipped] Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future am: 2ef92f885c -s ours\n\nam skip reason: Merged-In Ib209c9da84108e57d08493ce6e88e4c9f9a76851 with SHA-1 5366ce5ae6 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/bzip2/+/27143974\n\nChange-Id: I72d65b87bf413a43d9089059d0000c01cd2c94a2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2ef92f885cb414c650de27b8963a5612b922b91e", "tree": "84e21b3cdd579cb36a4c3d775f1037e005df74a2", "parents": [ "5366ce5ae69ce14a4b353557115aa94b0152946c", "a37ccfef0d305494fe4c7247d58aca687d24359d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 11:48:46 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 11:48:46 2024 -0700" }, "message": "Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future\n\nBug: 337098550\nMerged-In: Ib209c9da84108e57d08493ce6e88e4c9f9a76851\nChange-Id: I8351e69460d3391eb7ce581981cc0b3219ece9ce\n" }, { "commit": "7ca7786d579d5cc3eb54947e8e0670acae4ff7df", "tree": "84e21b3cdd579cb36a4c3d775f1037e005df74a2", "parents": [ "a37ccfef0d305494fe4c7247d58aca687d24359d", "5366ce5ae69ce14a4b353557115aa94b0152946c" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Apr 08 19:01:10 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 08 19:01:10 2024 +0000" }, "message": "Merge \"Allow bootable/deprecated-ota to use bzip2\" into main am: 4811a5bda0 am: 5366ce5ae6\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/3027297\n\nChange-Id: I186a413b81008d32269e7c711cc1814813a8d23c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5366ce5ae69ce14a4b353557115aa94b0152946c", "tree": "84e21b3cdd579cb36a4c3d775f1037e005df74a2", "parents": [ "8baa178cd21e8b9db4102beffb470b2cf38c98a4", "4811a5bda0ba56ae4f0a09882fa3140173e7ede3" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Apr 08 18:38:58 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 08 18:38:58 2024 +0000" }, "message": "Merge \"Allow bootable/deprecated-ota to use bzip2\" into main am: 4811a5bda0\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/3027297\n\nChange-Id: Ib209c9da84108e57d08493ce6e88e4c9f9a76851\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4811a5bda0ba56ae4f0a09882fa3140173e7ede3", "tree": "84e21b3cdd579cb36a4c3d775f1037e005df74a2", "parents": [ "8baa178cd21e8b9db4102beffb470b2cf38c98a4", "0e85376cd45d5006a3f938c3cefaf8661efa5870" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Apr 08 18:16:50 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Apr 08 18:16:50 2024 +0000" }, "message": "Merge \"Allow bootable/deprecated-ota to use bzip2\" into main" }, { "commit": "0e85376cd45d5006a3f938c3cefaf8661efa5870", "tree": "84e21b3cdd579cb36a4c3d775f1037e005df74a2", "parents": [ "8baa178cd21e8b9db4102beffb470b2cf38c98a4" ], "author": { "name": "Kelvin Zhang", "email": "zhangkelvin@google.com", "time": "Fri Apr 05 09:43:46 2024 -0700" }, "committer": { "name": "Kelvin Zhang", "email": "zhangkelvin@google.com", "time": "Fri Apr 05 09:43:46 2024 -0700" }, "message": "Allow bootable/deprecated-ota to use bzip2\n\nnon-AB code will be moved to bootable/deprecated-ota , so add necessary\nvisibility rules.\n\nTest: th\nBug: 324360816\nChange-Id: Icc56f020ab1470c797cad0d62e4bd027fcfcd703\n" }, { "commit": "a37ccfef0d305494fe4c7247d58aca687d24359d", "tree": "1cb768c94c4fac7578cee04f3e2d85d159c1aa92", "parents": [ "86c972052268f5ca42cdba13aaca55b3651ef011", "8baa178cd21e8b9db4102beffb470b2cf38c98a4" ], "author": { "name": "Sadaf Ebrahimi", "email": "sadafebrahimi@google.com", "time": "Thu Feb 22 20:19:51 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 22 20:19:51 2024 +0000" }, "message": "Merge \"Update OWNERS file\" into main am: 0aa4760e90 am: 8baa178cd2\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/2973872\n\nChange-Id: I2a8b9b1e834927c7604d98531188f5af1580fe48\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8baa178cd21e8b9db4102beffb470b2cf38c98a4", "tree": "1cb768c94c4fac7578cee04f3e2d85d159c1aa92", "parents": [ "86c972052268f5ca42cdba13aaca55b3651ef011", "0aa4760e905236d21b7463a800b2bd748fc47d7e" ], "author": { "name": "Sadaf Ebrahimi", "email": "sadafebrahimi@google.com", "time": "Thu Feb 22 19:37:32 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 22 19:37:32 2024 +0000" }, "message": "Merge \"Update OWNERS file\" into main am: 0aa4760e90\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/2973872\n\nChange-Id: Id434bec79b2118e93d903f05206cccabc3167595\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0aa4760e905236d21b7463a800b2bd748fc47d7e", "tree": "1cb768c94c4fac7578cee04f3e2d85d159c1aa92", "parents": [ "b28b28565f76dd1e94a18ea927325067f6a679b1", "3d4100e84bf471f483293ff472da3563d7b63fcb" ], "author": { "name": "Sadaf Ebrahimi", "email": "sadafebrahimi@google.com", "time": "Thu Feb 22 18:57:13 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Feb 22 18:57:13 2024 +0000" }, "message": "Merge \"Update OWNERS file\" into main" }, { "commit": "3d4100e84bf471f483293ff472da3563d7b63fcb", "tree": "1cb768c94c4fac7578cee04f3e2d85d159c1aa92", "parents": [ "b28b28565f76dd1e94a18ea927325067f6a679b1" ], "author": { "name": "Sadaf Ebrahimi", "email": "sadafebrahimi@google.com", "time": "Thu Feb 22 17:49:50 2024 +0000" }, "committer": { "name": "Sadaf Ebrahimi", "email": "sadafebrahimi@google.com", "time": "Thu Feb 22 18:53:00 2024 +0000" }, "message": "Update OWNERS file\n\nRemove Xooglers deymo and xunchang\n\nTest: TreeHugger\nChange-Id: I2aa83268f40aa86822716366934d3dd23f0ff69a\n" }, { "commit": "86c972052268f5ca42cdba13aaca55b3651ef011", "tree": "511757607f3b5e7323cec0f91a5ad1302a2edabd", "parents": [ "af971b5524a392944a8fd1423b1860f3ab2919ec", "b28b28565f76dd1e94a18ea927325067f6a679b1" ], "author": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Wed Aug 16 07:05:16 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 16 07:05:16 2023 +0000" }, "message": "Merge \"Make bzip2 visible to python.\" into main am: 6a21cf6082 am: 0632374278 am: 0b80449019 am: e1ce711003 am: b28b28565f\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/2704173\n\nChange-Id: Ida2db1dd3ea432dc9f4018c475cb4b52c81acac8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b28b28565f76dd1e94a18ea927325067f6a679b1", "tree": "511757607f3b5e7323cec0f91a5ad1302a2edabd", "parents": [ "af971b5524a392944a8fd1423b1860f3ab2919ec", "e1ce711003ee34ac8194e944eb53ff00e417fac1" ], "author": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Wed Aug 16 06:20:34 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 16 06:20:34 2023 +0000" }, "message": "Merge \"Make bzip2 visible to python.\" into main am: 6a21cf6082 am: 0632374278 am: 0b80449019 am: e1ce711003\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/2704173\n\nChange-Id: Ib65fda1c402436cf847716e838b542911601a3d3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e1ce711003ee34ac8194e944eb53ff00e417fac1", "tree": "511757607f3b5e7323cec0f91a5ad1302a2edabd", "parents": [ "af971b5524a392944a8fd1423b1860f3ab2919ec", "0b8044901913d5fd0755ed94239d4c8c64554b28" ], "author": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Wed Aug 16 05:35:48 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 16 05:35:48 2023 +0000" }, "message": "Merge \"Make bzip2 visible to python.\" into main am: 6a21cf6082 am: 0632374278 am: 0b80449019\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/2704173\n\nChange-Id: I3e92da373a240b948067ebb876cee6ddfcee6b37\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0b8044901913d5fd0755ed94239d4c8c64554b28", "tree": "511757607f3b5e7323cec0f91a5ad1302a2edabd", "parents": [ "af971b5524a392944a8fd1423b1860f3ab2919ec", "0632374278713e452d2c3e631427900715384836" ], "author": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Wed Aug 16 04:51:17 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 16 04:51:17 2023 +0000" }, "message": "Merge \"Make bzip2 visible to python.\" into main am: 6a21cf6082 am: 0632374278\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/2704173\n\nChange-Id: Id202c3847af280bc051ffd16a0964c1540142b52\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0632374278713e452d2c3e631427900715384836", "tree": "511757607f3b5e7323cec0f91a5ad1302a2edabd", "parents": [ "af971b5524a392944a8fd1423b1860f3ab2919ec", "6a21cf60825425520166571c167820d38a818cc4" ], "author": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Wed Aug 16 04:09:31 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 16 04:09:31 2023 +0000" }, "message": "Merge \"Make bzip2 visible to python.\" into main am: 6a21cf6082\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/2704173\n\nChange-Id: Iac80a18d39dbfc009621080c7c4031678f59ab2b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6a21cf60825425520166571c167820d38a818cc4", "tree": "511757607f3b5e7323cec0f91a5ad1302a2edabd", "parents": [ "af971b5524a392944a8fd1423b1860f3ab2919ec", "794982c610be8a0d7a0253cde416f733c8a98471" ], "author": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Wed Aug 16 03:09:49 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Aug 16 03:09:49 2023 +0000" }, "message": "Merge \"Make bzip2 visible to python.\" into main" }, { "commit": "794982c610be8a0d7a0253cde416f733c8a98471", "tree": "511757607f3b5e7323cec0f91a5ad1302a2edabd", "parents": [ "af971b5524a392944a8fd1423b1860f3ab2919ec" ], "author": { "name": "James Farrell", "email": "jamesfarrell@google.com", "time": "Thu Aug 10 18:44:24 2023 +0000" }, "committer": { "name": "James Farrell", "email": "jamesfarrell@google.com", "time": "Thu Aug 10 18:44:24 2023 +0000" }, "message": "Make bzip2 visible to python.\n\nBug: 278602456\nChange-Id: I7c8e7a909f0b723aeeec2909542009b92e25b6fd\n" }, { "commit": "af971b5524a392944a8fd1423b1860f3ab2919ec", "tree": "8ac7bdf9fa8af862b2cddad402dbeac22494f49a", "parents": [ "07c706276528bdcf0061fc936be15155d32fb9f4", "c70a30be1fea6cd203b22eff0157f676d773f36c" ], "author": { "name": "Yuntao Xu", "email": "yuntaoxu@google.com", "time": "Fri Jan 14 19:20:32 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 14 19:20:32 2022 +0000" }, "message": "Merge \"Add one visibility to libbz module\" am: af1e6935ef am: 5439a186ba am: 38345d94b9 am: c70a30be1f\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1945434\n\nChange-Id: Ia29a1ec69235441fa26da20642e3c6c9e6b71c09\n" }, { "commit": "c70a30be1fea6cd203b22eff0157f676d773f36c", "tree": "8ac7bdf9fa8af862b2cddad402dbeac22494f49a", "parents": [ "e86ffaf4a22b873b9df132a2745ccc7f088ce438", "38345d94b93b5db6b9fdfd542f076abe66ac3a83" ], "author": { "name": "Yuntao Xu", "email": "yuntaoxu@google.com", "time": "Fri Jan 14 19:10:13 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 14 19:10:13 2022 +0000" }, "message": "Merge \"Add one visibility to libbz module\" am: af1e6935ef am: 5439a186ba am: 38345d94b9\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1945434\n\nChange-Id: I3e2be0cc9693e0c8eea68e81a8a0bd218dfc1e84\n" }, { "commit": "38345d94b93b5db6b9fdfd542f076abe66ac3a83", "tree": "8ac7bdf9fa8af862b2cddad402dbeac22494f49a", "parents": [ "019cf7b5e4367bf81153381d48bce96e48c223ce", "5439a186ba409ec90d16871449e4260443c7c84e" ], "author": { "name": "Yuntao Xu", "email": "yuntaoxu@google.com", "time": "Fri Jan 14 18:52:16 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 14 18:52:16 2022 +0000" }, "message": "Merge \"Add one visibility to libbz module\" am: af1e6935ef am: 5439a186ba\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1945434\n\nChange-Id: I37e1c61c9501b6f9ad187dc229e6505e7af8d8e3\n" }, { "commit": "5439a186ba409ec90d16871449e4260443c7c84e", "tree": "8ac7bdf9fa8af862b2cddad402dbeac22494f49a", "parents": [ "f85f90d0302842664b51d0e2ae5ee1ed41914cce", "af1e6935efd016a7c8ec5e49e86f7099d5107e5c" ], "author": { "name": "Yuntao Xu", "email": "yuntaoxu@google.com", "time": "Fri Jan 14 18:32:31 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 14 18:32:31 2022 +0000" }, "message": "Merge \"Add one visibility to libbz module\" am: af1e6935ef\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1945434\n\nChange-Id: Ic329d5e10bb516c00a29a95a0d5c99a87b863064\n" }, { "commit": "af1e6935efd016a7c8ec5e49e86f7099d5107e5c", "tree": "8ac7bdf9fa8af862b2cddad402dbeac22494f49a", "parents": [ "f85f90d0302842664b51d0e2ae5ee1ed41914cce", "81084e1895d4c3f4a4aae71d06db53f07762eb60" ], "author": { "name": "Yuntao Xu", "email": "yuntaoxu@google.com", "time": "Fri Jan 14 18:11:06 2022 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jan 14 18:11:06 2022 +0000" }, "message": "Merge \"Add one visibility to libbz module\"" }, { "commit": "81084e1895d4c3f4a4aae71d06db53f07762eb60", "tree": "8ac7bdf9fa8af862b2cddad402dbeac22494f49a", "parents": [ "f85f90d0302842664b51d0e2ae5ee1ed41914cce" ], "author": { "name": "Yuntao Xu", "email": "yuntaoxu@google.com", "time": "Tue Jan 11 13:09:56 2022 -0800" }, "committer": { "name": "Yuntao Xu", "email": "yuntaoxu@google.com", "time": "Tue Jan 11 13:16:28 2022 -0800" }, "message": "Add one visibility to libbz module\n\nAdded one visibility to the libbz module, to make it visible to moudles\nin the vendor directory (which is needed to convert Make modules to\nSoong in the vendor dir of the interal_master branch).\n\nBug: 205649904\nTest: m libbz\nTest: TreeHugger\nChange-Id: Ia256108d21abdce5dda886ad8113c2d2bbfdac6f\n" }, { "commit": "07c706276528bdcf0061fc936be15155d32fb9f4", "tree": "c025e10d17e7a75839680f1c89e2576718cf53e3", "parents": [ "31cda0aa166d53d93c2f3d271ad24801e5844fa0", "e86ffaf4a22b873b9df132a2745ccc7f088ce438" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Dec 13 20:50:17 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 13 20:50:17 2021 +0000" }, "message": "Merge \"Really sync with bzip1.0.8.\" am: 984a9c5ba9 am: f85f90d030 am: 019cf7b5e4 am: e86ffaf4a2\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1915250\n\nChange-Id: I1970c819e51a1688fb95cad0640fed28931d0836\n" }, { "commit": "e86ffaf4a22b873b9df132a2745ccc7f088ce438", "tree": "c025e10d17e7a75839680f1c89e2576718cf53e3", "parents": [ "af4fb9fa8f24e111103a8101d85b660c90d1e2e4", "019cf7b5e4367bf81153381d48bce96e48c223ce" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Dec 13 20:27:48 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 13 20:27:48 2021 +0000" }, "message": "Merge \"Really sync with bzip1.0.8.\" am: 984a9c5ba9 am: f85f90d030 am: 019cf7b5e4\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1915250\n\nChange-Id: I471bc3886bb2edcc859d06dab6270510b8cc0bcf\n" }, { "commit": "019cf7b5e4367bf81153381d48bce96e48c223ce", "tree": "c025e10d17e7a75839680f1c89e2576718cf53e3", "parents": [ "af4fb9fa8f24e111103a8101d85b660c90d1e2e4", "f85f90d0302842664b51d0e2ae5ee1ed41914cce" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Dec 13 20:11:48 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 13 20:11:48 2021 +0000" }, "message": "Merge \"Really sync with bzip1.0.8.\" am: 984a9c5ba9 am: f85f90d030\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1915250\n\nChange-Id: I218d66e4a03d1d64ae956c3fba2de107f12595a1\n" }, { "commit": "f85f90d0302842664b51d0e2ae5ee1ed41914cce", "tree": "c025e10d17e7a75839680f1c89e2576718cf53e3", "parents": [ "af4fb9fa8f24e111103a8101d85b660c90d1e2e4", "984a9c5ba942f35e18c3b904252fc249febeba4e" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Dec 13 19:50:31 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 13 19:50:31 2021 +0000" }, "message": "Merge \"Really sync with bzip1.0.8.\" am: 984a9c5ba9\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1915250\n\nChange-Id: I02a24d63d46ffd20cce96c83c209cae5c08b6100\n" }, { "commit": "984a9c5ba942f35e18c3b904252fc249febeba4e", "tree": "c025e10d17e7a75839680f1c89e2576718cf53e3", "parents": [ "af4fb9fa8f24e111103a8101d85b660c90d1e2e4", "8645cf6c0da81fb958450394f463ff7c66edb49b" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Dec 13 19:28:53 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Dec 13 19:28:53 2021 +0000" }, "message": "Merge \"Really sync with bzip1.0.8.\"" }, { "commit": "8645cf6c0da81fb958450394f463ff7c66edb49b", "tree": "c025e10d17e7a75839680f1c89e2576718cf53e3", "parents": [ "af4fb9fa8f24e111103a8101d85b660c90d1e2e4" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Dec 08 15:07:46 2021 -0800" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Dec 08 15:07:46 2021 -0800" }, "message": "Really sync with bzip1.0.8.\n\nThe previous git update seems to have gone horribly wrong. Try to dig\nourselves out of that hole (at least temporarily; the next merge might\nbe painful too?) by unpacking the current release tarball and checking\nin the difference.\n\nAs a double-check, `git diff bzip2-1.0.8` looks good after this change,\nonly showing expected changes like \"there\u0027s an Android.bp file here that\nisn\u0027t upstream\".\n\nBug: http://b/179636234\nTest: treehugger\nChange-Id: Ia9612913e319a1cfa29f0c370f0a3775d8ecb496\n" }, { "commit": "31cda0aa166d53d93c2f3d271ad24801e5844fa0", "tree": "134faa56762a17c775fa18d4b4784aeea3e352ae", "parents": [ "2e523d3dd284415dd5f10ed42db14f8d6f1bc64d", "b70917a06af5a5e0687049d49cb1238681d427f4" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jun 02 16:48:56 2021 +0000" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jun 02 16:48:56 2021 +0000" }, "message": "Merge sc-mainline-prod\n\nBug: 189946434\nChange-Id: I8f01788681f66ff68cd4b2aeccdcce5c9bf57c1e\n" }, { "commit": "2e523d3dd284415dd5f10ed42db14f8d6f1bc64d", "tree": "134faa56762a17c775fa18d4b4784aeea3e352ae", "parents": [ "c3aee5ae974d354679750343189561ee59924bda", "af4fb9fa8f24e111103a8101d85b660c90d1e2e4" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Feb 20 15:52:01 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Feb 20 15:52:01 2021 +0000" }, "message": "[automerger skipped] Mark ab/7061308 as merged in stage. am: 3881c145da -s ours am: 4906db6ae5 -s ours am: af4fb9fa8f -s ours\n\nam skip reason: Change-Id I395973694367a1ab04cf8b3c3a3a3df5ac63cd52 with SHA-1 825f8f52c4 is in history\n\nOriginal change: undetermined\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I132e944e5c8635ff32e1e9798dfb9727ea3742a8\n" }, { "commit": "b70917a06af5a5e0687049d49cb1238681d427f4", "tree": "134faa56762a17c775fa18d4b4784aeea3e352ae", "parents": [ "004f79fc7b3a4fb846c1ca5b7f928553ca7cf477", "af4fb9fa8f24e111103a8101d85b660c90d1e2e4" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Feb 20 15:50:21 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Feb 20 15:50:21 2021 +0000" }, "message": "[automerger skipped] Mark ab/7061308 as merged in stage. am: 3881c145da -s ours am: 4906db6ae5 -s ours am: af4fb9fa8f -s ours\n\nam skip reason: Change-Id I395973694367a1ab04cf8b3c3a3a3df5ac63cd52 with SHA-1 825f8f52c4 is in history\n\nOriginal change: undetermined\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Iff0885aad039143a367091bb18bbdfce002d22ed\n" }, { "commit": "af4fb9fa8f24e111103a8101d85b660c90d1e2e4", "tree": "134faa56762a17c775fa18d4b4784aeea3e352ae", "parents": [ "14ffb5293683c81db83547b7d444c246b09d55d9", "4906db6ae5026433cca9349b30f77bc5feb84560" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Feb 20 15:15:02 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Feb 20 15:15:02 2021 +0000" }, "message": "[automerger skipped] Mark ab/7061308 as merged in stage. am: 3881c145da -s ours am: 4906db6ae5 -s ours\n\nam skip reason: Change-Id I395973694367a1ab04cf8b3c3a3a3df5ac63cd52 with SHA-1 825f8f52c4 is in history\n\nOriginal change: undetermined\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I671e5b79af283bba024771c107f5bf36077e5bb0\n" }, { "commit": "4906db6ae5026433cca9349b30f77bc5feb84560", "tree": "134faa56762a17c775fa18d4b4784aeea3e352ae", "parents": [ "61ca10473cc7b8a454ecb911368152ef4052875b", "3881c145da152c2a3250ed9d4eb50891ab319777" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Feb 20 14:00:53 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Feb 20 14:00:53 2021 +0000" }, "message": "[automerger skipped] Mark ab/7061308 as merged in stage. am: 3881c145da -s ours\n\nam skip reason: Change-Id I395973694367a1ab04cf8b3c3a3a3df5ac63cd52 with SHA-1 825f8f52c4 is in history\n\nOriginal change: undetermined\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I01d377a2babc97bfcef990637fabaec7d5dd603b\n" }, { "commit": "3881c145da152c2a3250ed9d4eb50891ab319777", "tree": "134faa56762a17c775fa18d4b4784aeea3e352ae", "parents": [ "89e54811aaa08b093aacc69a7f61c475790349a3", "825f8f52c4ba996f262b4b9dcaeb46ec3711b3e4" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Feb 20 00:24:04 2021 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Feb 20 00:24:04 2021 -0800" }, "message": "Mark ab/7061308 as merged in stage.\n\nBug: 180401296\nMerged-In: I395973694367a1ab04cf8b3c3a3a3df5ac63cd52\nChange-Id: I53b8b7b8ffe0b8807c1824780c72b0ddd9e83225\n" }, { "commit": "004f79fc7b3a4fb846c1ca5b7f928553ca7cf477", "tree": "134faa56762a17c775fa18d4b4784aeea3e352ae", "parents": [ "73a86d82251dfe0236cb440eda5971c0d3c3bd58", "14ffb5293683c81db83547b7d444c246b09d55d9" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Feb 17 19:41:36 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 17 19:41:36 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to external/bzip2\" am: b37166d895 am: 89e54811aa am: 61ca10473c am: 14ffb52936\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1588829\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I08521f01ee993aebecc182c93236ca09a6e56d6f\n" }, { "commit": "c3aee5ae974d354679750343189561ee59924bda", "tree": "134faa56762a17c775fa18d4b4784aeea3e352ae", "parents": [ "d0edee9f46fde241e8701adc0c25835c18184eb8", "14ffb5293683c81db83547b7d444c246b09d55d9" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Feb 17 19:26:21 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 17 19:26:21 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to external/bzip2\" am: b37166d895 am: 89e54811aa am: 61ca10473c am: 14ffb52936\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1588829\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: If1073f6f31921598c5befd2ae387acaaee730ebc\n" }, { "commit": "14ffb5293683c81db83547b7d444c246b09d55d9", "tree": "134faa56762a17c775fa18d4b4784aeea3e352ae", "parents": [ "b2e4505689e553e5fd40c96632258c71eeb38c94", "61ca10473cc7b8a454ecb911368152ef4052875b" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Feb 17 18:53:10 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 17 18:53:10 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to external/bzip2\" am: b37166d895 am: 89e54811aa am: 61ca10473c\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1588829\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I1294ecabc94be2d4cede260d6f8452a2cc063074\n" }, { "commit": "61ca10473cc7b8a454ecb911368152ef4052875b", "tree": "134faa56762a17c775fa18d4b4784aeea3e352ae", "parents": [ "09d6838ce7f9a93c9941f5577925f8a4d2276785", "89e54811aaa08b093aacc69a7f61c475790349a3" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Feb 17 18:06:45 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 17 18:06:45 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to external/bzip2\" am: b37166d895 am: 89e54811aa\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1588829\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Icac8ada24f3d4f239dd6c007234cc145167b0d0c\n" }, { "commit": "89e54811aaa08b093aacc69a7f61c475790349a3", "tree": "134faa56762a17c775fa18d4b4784aeea3e352ae", "parents": [ "71f0a6e3bbf7bb3f2e709903f26a1d56b8b42e84", "b37166d89518b33ba385bda06c499f0c036c5f1e" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Feb 17 17:35:15 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 17 17:35:15 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to external/bzip2\" am: b37166d895\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1588829\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I97c1f9a74d5f8706c62266ebc1be294923b95f20\n" }, { "commit": "b37166d89518b33ba385bda06c499f0c036c5f1e", "tree": "134faa56762a17c775fa18d4b4784aeea3e352ae", "parents": [ "b4ea5c3c54255d95a42ad0db503d8edf9f869b96", "8a97fe02706fa428782762210eac061407ec55c9" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Feb 17 17:32:48 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Feb 17 17:32:48 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to external/bzip2\"" }, { "commit": "8a97fe02706fa428782762210eac061407ec55c9", "tree": "134faa56762a17c775fa18d4b4784aeea3e352ae", "parents": [ "b4ea5c3c54255d95a42ad0db503d8edf9f869b96" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 12 14:17:16 2021 -0800" }, "committer": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 12 14:17:16 2021 -0800" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to external/bzip2\n\nAdded SPDX-license-identifier-BSD legacy_unencumbered to:\n Android.bp\n\nBug: 68860345\nBug: 151177513\nBug: 151953481\n\nTest: m all\n\nExempt-From-Owner-Approval: janitorial work\nChange-Id: I22d7c58f36a4227732ac28d9275d22d7b8d42423\n" }, { "commit": "73a86d82251dfe0236cb440eda5971c0d3c3bd58", "tree": "0656dc4c5097fcc671a80a04c3556bda4e51be1d", "parents": [ "b8f655ca23e507411e151496c9a540141995a460", "b2e4505689e553e5fd40c96632258c71eeb38c94" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Feb 09 03:17:36 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 09 03:17:36 2021 +0000" }, "message": "Merge \"Merge commit \u00276a8690fc8d26c815e798c588f796eabe9d684cf0\u0027 into upstream-mas\" am: b4ea5c3c54 am: 71f0a6e3bb am: 09d6838ce7 am: b2e4505689\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1580201\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I36e94b7766d7e0f058550385283a8213309aa82f\n" }, { "commit": "d0edee9f46fde241e8701adc0c25835c18184eb8", "tree": "0656dc4c5097fcc671a80a04c3556bda4e51be1d", "parents": [ "b8f655ca23e507411e151496c9a540141995a460", "b2e4505689e553e5fd40c96632258c71eeb38c94" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Feb 09 03:14:37 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 09 03:14:37 2021 +0000" }, "message": "Merge \"Merge commit \u00276a8690fc8d26c815e798c588f796eabe9d684cf0\u0027 into upstream-mas\" am: b4ea5c3c54 am: 71f0a6e3bb am: 09d6838ce7 am: b2e4505689\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1580201\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I7b8ff3a3b4b294fa78287475d7c9ec764db66284\n" }, { "commit": "b2e4505689e553e5fd40c96632258c71eeb38c94", "tree": "0656dc4c5097fcc671a80a04c3556bda4e51be1d", "parents": [ "b8f655ca23e507411e151496c9a540141995a460", "09d6838ce7f9a93c9941f5577925f8a4d2276785" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Feb 09 02:17:54 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 09 02:17:54 2021 +0000" }, "message": "Merge \"Merge commit \u00276a8690fc8d26c815e798c588f796eabe9d684cf0\u0027 into upstream-mas\" am: b4ea5c3c54 am: 71f0a6e3bb am: 09d6838ce7\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1580201\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I951a70c12cc16ad0827b0b2019d86522f6ff60cf\n" }, { "commit": "09d6838ce7f9a93c9941f5577925f8a4d2276785", "tree": "0656dc4c5097fcc671a80a04c3556bda4e51be1d", "parents": [ "825f8f52c4ba996f262b4b9dcaeb46ec3711b3e4", "71f0a6e3bbf7bb3f2e709903f26a1d56b8b42e84" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Feb 09 01:22:13 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 09 01:22:13 2021 +0000" }, "message": "Merge \"Merge commit \u00276a8690fc8d26c815e798c588f796eabe9d684cf0\u0027 into upstream-mas\" am: b4ea5c3c54 am: 71f0a6e3bb\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1580201\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Id56f76519b71ae5044bc2e3fe3f232bade416b4d\n" }, { "commit": "71f0a6e3bbf7bb3f2e709903f26a1d56b8b42e84", "tree": "0656dc4c5097fcc671a80a04c3556bda4e51be1d", "parents": [ "72067b0fb414137ac4a6f46919d346670ffe312c", "b4ea5c3c54255d95a42ad0db503d8edf9f869b96" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Feb 08 23:57:30 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Feb 08 23:57:30 2021 +0000" }, "message": "Merge \"Merge commit \u00276a8690fc8d26c815e798c588f796eabe9d684cf0\u0027 into upstream-mas\" am: b4ea5c3c54\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1580201\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I5a777fa5e8cfb5abae10f04c453506225ca99d55\n" }, { "commit": "b4ea5c3c54255d95a42ad0db503d8edf9f869b96", "tree": "0656dc4c5097fcc671a80a04c3556bda4e51be1d", "parents": [ "72067b0fb414137ac4a6f46919d346670ffe312c", "9e9b4f76591304e8bc8ab9d199fd1341b22acc50" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Feb 08 23:33:00 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Feb 08 23:33:00 2021 +0000" }, "message": "Merge \"Merge commit \u00276a8690fc8d26c815e798c588f796eabe9d684cf0\u0027 into upstream-mas\"" }, { "commit": "9e9b4f76591304e8bc8ab9d199fd1341b22acc50", "tree": "0656dc4c5097fcc671a80a04c3556bda4e51be1d", "parents": [ "72067b0fb414137ac4a6f46919d346670ffe312c", "6a8690fc8d26c815e798c588f796eabe9d684cf0" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Feb 08 10:21:04 2021 -0800" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Feb 08 10:22:56 2021 -0800" }, "message": "Merge commit \u00276a8690fc8d26c815e798c588f796eabe9d684cf0\u0027 into upstream-mas\n\nFix METADATA and get in sync with upstream.\n\nBug: http://b/179636234\nTest: treehugger\nChange-Id: I832ef9ca92e0a577aeea69cb93a0d10969198b27\n" }, { "commit": "b8f655ca23e507411e151496c9a540141995a460", "tree": "9fab8a3fac5c5d60720510ecc363188daad5ab59", "parents": [ "1f721e3ef792e6fa03e67355b8e13b010ff0dd14", "825f8f52c4ba996f262b4b9dcaeb46ec3711b3e4" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Nov 24 02:36:33 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 24 02:36:33 2020 +0000" }, "message": "Mark ab/6881855 as merged am: 72067b0fb4 am: 825f8f52c4\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/bzip2/+/13111946\n\nChange-Id: Ic1b4908596bdbfc5a3a0606462a38786414646a4\n" }, { "commit": "825f8f52c4ba996f262b4b9dcaeb46ec3711b3e4", "tree": "9fab8a3fac5c5d60720510ecc363188daad5ab59", "parents": [ "fb9deff4e69e7616ebbb71facb83924aeed41a91", "72067b0fb414137ac4a6f46919d346670ffe312c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Nov 24 02:01:19 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 24 02:01:19 2020 +0000" }, "message": "Mark ab/6881855 as merged am: 72067b0fb4\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/bzip2/+/13111946\n\nChange-Id: I395973694367a1ab04cf8b3c3a3a3df5ac63cd52\n" }, { "commit": "72067b0fb414137ac4a6f46919d346670ffe312c", "tree": "9fab8a3fac5c5d60720510ecc363188daad5ab59", "parents": [ "c6dbbc82eb58f0c13d22f8c9ab87ce875bfaa769", "7accb6b15b14e5f088799c0ee36bf6859d34d8e3" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Nov 23 11:30:03 2020 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Nov 23 11:30:03 2020 -0800" }, "message": "Mark ab/6881855 as merged\n\nBug: 172690556\nChange-Id: Ic7ff06eda9a716782cb4ed09bb121710db262730\n" }, { "commit": "1f721e3ef792e6fa03e67355b8e13b010ff0dd14", "tree": "9fab8a3fac5c5d60720510ecc363188daad5ab59", "parents": [ "d39372a271451739bae9bfd64b695b202e4b29fa", "fb9deff4e69e7616ebbb71facb83924aeed41a91" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 09 03:50:50 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 09 03:50:50 2020 +0000" }, "message": "[automerger skipped] Skip ab/6749736 in stage. am: c6dbbc82eb -s ours am: a606d075f7 -s ours am: fb9deff4e6 -s ours\n\nam skip reason: Change-Id Id641096642561af9915b18b899b9123afeb13669 with SHA-1 5e4f974ea5 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/bzip2/+/12796963\n\nChange-Id: I4db9908cb12ea510755070b90893af99324e0971\n" }, { "commit": "fb9deff4e69e7616ebbb71facb83924aeed41a91", "tree": "9fab8a3fac5c5d60720510ecc363188daad5ab59", "parents": [ "7accb6b15b14e5f088799c0ee36bf6859d34d8e3", "a606d075f75fe540c37e516a2032722c90c17ced" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 09 03:27:41 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 09 03:27:41 2020 +0000" }, "message": "[automerger skipped] Skip ab/6749736 in stage. am: c6dbbc82eb -s ours am: a606d075f7 -s ours\n\nam skip reason: Change-Id Id641096642561af9915b18b899b9123afeb13669 with SHA-1 5e4f974ea5 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/bzip2/+/12796963\n\nChange-Id: I20f9d2156d3054243cffa06e58f27d87cd5dc546\n" }, { "commit": "a606d075f75fe540c37e516a2032722c90c17ced", "tree": "9fab8a3fac5c5d60720510ecc363188daad5ab59", "parents": [ "58dd9ee8ce22932154df2ec2bcd7b8d21f97f93a", "c6dbbc82eb58f0c13d22f8c9ab87ce875bfaa769" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 09 02:31:16 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 09 02:31:16 2020 +0000" }, "message": "[automerger skipped] Skip ab/6749736 in stage. am: c6dbbc82eb -s ours\n\nam skip reason: Change-Id Id641096642561af9915b18b899b9123afeb13669 with SHA-1 5e4f974ea5 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/bzip2/+/12796963\n\nChange-Id: Ie0e2bd0c3c7bb810c7943954fd3fea4b3b9d903a\n" }, { "commit": "c6dbbc82eb58f0c13d22f8c9ab87ce875bfaa769", "tree": "9fab8a3fac5c5d60720510ecc363188daad5ab59", "parents": [ "867e2860573c8457a0eb53c0a9aed69e7e7e4d9c", "5e4f974ea5e5a600bfab2767e17f3bf73bb7c7a5" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 08 17:20:50 2020 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 08 17:20:50 2020 -0700" }, "message": "Skip ab/6749736 in stage.\n\nMerged-In: Id641096642561af9915b18b899b9123afeb13669\nChange-Id: Ieb95ba69251108be74ab07b75c7fd437301e6c7d\n" }, { "commit": "d39372a271451739bae9bfd64b695b202e4b29fa", "tree": "9fab8a3fac5c5d60720510ecc363188daad5ab59", "parents": [ "11d6a683f787ccc57dc72d9b29edc62caab53980", "7accb6b15b14e5f088799c0ee36bf6859d34d8e3" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Aug 27 20:20:10 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 27 20:20:10 2020 +0000" }, "message": "[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 867e286057 -s ours am: 66bd02c98b -s ours am: 58dd9ee8ce -s ours am: 7accb6b15b -s ours\n\nam skip reason: Change-Id I207b48f559ebeef67028e7273ee46aa07accaf75 with SHA-1 c2e02fb6bf is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/bzip2/+/12469867\n\nChange-Id: I1a82cee829739532c662acf19490ff798f4544fb\n" }, { "commit": "7accb6b15b14e5f088799c0ee36bf6859d34d8e3", "tree": "9fab8a3fac5c5d60720510ecc363188daad5ab59", "parents": [ "fb1339d0467fad773c5a3cd4caa27c5a4ae9a683", "58dd9ee8ce22932154df2ec2bcd7b8d21f97f93a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Aug 27 19:12:45 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 27 19:12:45 2020 +0000" }, "message": "[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 867e286057 -s ours am: 66bd02c98b -s ours am: 58dd9ee8ce -s ours\n\nam skip reason: Change-Id I207b48f559ebeef67028e7273ee46aa07accaf75 with SHA-1 c2e02fb6bf is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/bzip2/+/12469867\n\nChange-Id: Ie06a3bd95f063f4ddfa3a1f9d49fd0ce04b2459c\n" }, { "commit": "58dd9ee8ce22932154df2ec2bcd7b8d21f97f93a", "tree": "9fab8a3fac5c5d60720510ecc363188daad5ab59", "parents": [ "0cda1e14cb3f290b1283d3406553df698c5d8822", "66bd02c98b758e3eb969c9014d2ddc4ba7908714" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Aug 27 18:54:28 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 27 18:54:28 2020 +0000" }, "message": "[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 867e286057 -s ours am: 66bd02c98b -s ours\n\nam skip reason: Change-Id I207b48f559ebeef67028e7273ee46aa07accaf75 with SHA-1 c2e02fb6bf is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/bzip2/+/12469867\n\nChange-Id: I9c51372b72dfbb0acbab180d272849aca566a636\n" }, { "commit": "66bd02c98b758e3eb969c9014d2ddc4ba7908714", "tree": "9fab8a3fac5c5d60720510ecc363188daad5ab59", "parents": [ "d3f609182ff02708ee16a1dc44da205b52223b8c", "867e2860573c8457a0eb53c0a9aed69e7e7e4d9c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Aug 27 18:23:34 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 27 18:23:34 2020 +0000" }, "message": "[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 867e286057 -s ours\n\nam skip reason: Change-Id I207b48f559ebeef67028e7273ee46aa07accaf75 with SHA-1 c2e02fb6bf is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/bzip2/+/12469867\n\nChange-Id: I9ef9f7f08755b25d41a967d543a13440ae8cc48f\n" }, { "commit": "867e2860573c8457a0eb53c0a9aed69e7e7e4d9c", "tree": "9fab8a3fac5c5d60720510ecc363188daad5ab59", "parents": [ "3eb1df41dae5ff46ae95a05e2894370529adb815", "c2e02fb6bf5ed541ec1d8185c2560ebd520a169a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Aug 27 09:44:05 2020 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Aug 27 09:44:05 2020 -0700" }, "message": "Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged\n\nBug: 166295507\nMerged-In: I207b48f559ebeef67028e7273ee46aa07accaf75\nChange-Id: Ic5ec4289ae20d11298ad8d036de66c92683ed362\n" }, { "commit": "11d6a683f787ccc57dc72d9b29edc62caab53980", "tree": "9fab8a3fac5c5d60720510ecc363188daad5ab59", "parents": [ "7741f62fbdbd37f3a39eb825470635cb0dac602d", "fb1339d0467fad773c5a3cd4caa27c5a4ae9a683" ], "author": { "name": "David Anderson", "email": "dvander@google.com", "time": "Thu Aug 20 00:48:46 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 20 00:48:46 2020 +0000" }, "message": "Merge \"Allow libsnapshot to link to libbz.\" am: 2ef0545ad7 am: 3eb1df41da am: d3f609182f am: 0cda1e14cb am: fb1339d046\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1393619\n\nChange-Id: I259b3588d6e3c9e57c3020e7cd8bc43b3c093f7f\n" }, { "commit": "fb1339d0467fad773c5a3cd4caa27c5a4ae9a683", "tree": "9fab8a3fac5c5d60720510ecc363188daad5ab59", "parents": [ "e2d2915caafa9d232ddfc33018b34b2f91007cfa", "0cda1e14cb3f290b1283d3406553df698c5d8822" ], "author": { "name": "David Anderson", "email": "dvander@google.com", "time": "Thu Aug 20 00:38:49 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 20 00:38:49 2020 +0000" }, "message": "Merge \"Allow libsnapshot to link to libbz.\" am: 2ef0545ad7 am: 3eb1df41da am: d3f609182f am: 0cda1e14cb\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1393619\n\nChange-Id: I5f4a8a90fcb7c972d8148abe28c291a9f74a8957\n" }, { "commit": "0cda1e14cb3f290b1283d3406553df698c5d8822", "tree": "9fab8a3fac5c5d60720510ecc363188daad5ab59", "parents": [ "5e4f974ea5e5a600bfab2767e17f3bf73bb7c7a5", "d3f609182ff02708ee16a1dc44da205b52223b8c" ], "author": { "name": "David Anderson", "email": "dvander@google.com", "time": "Thu Aug 20 00:24:58 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 20 00:24:58 2020 +0000" }, "message": "Merge \"Allow libsnapshot to link to libbz.\" am: 2ef0545ad7 am: 3eb1df41da am: d3f609182f\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1393619\n\nChange-Id: I2f7519d211c46bd3baf8b09903a059fc591d8dbb\n" }, { "commit": "d3f609182ff02708ee16a1dc44da205b52223b8c", "tree": "9fab8a3fac5c5d60720510ecc363188daad5ab59", "parents": [ "c2e02fb6bf5ed541ec1d8185c2560ebd520a169a", "3eb1df41dae5ff46ae95a05e2894370529adb815" ], "author": { "name": "David Anderson", "email": "dvander@google.com", "time": "Thu Aug 20 00:08:40 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 20 00:08:40 2020 +0000" }, "message": "Merge \"Allow libsnapshot to link to libbz.\" am: 2ef0545ad7 am: 3eb1df41da\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1393619\n\nChange-Id: I08b78692c5d75d358c5a39248501795563720767\n" }, { "commit": "3eb1df41dae5ff46ae95a05e2894370529adb815", "tree": "9fab8a3fac5c5d60720510ecc363188daad5ab59", "parents": [ "a75d53c4bac5db59bad722678f1c231ef2d92543", "2ef0545ad79dc57d5f7b987aeca3805b5793fa1c" ], "author": { "name": "David Anderson", "email": "dvander@google.com", "time": "Wed Aug 19 23:25:02 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 19 23:25:02 2020 +0000" }, "message": "Merge \"Allow libsnapshot to link to libbz.\" am: 2ef0545ad7\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1393619\n\nChange-Id: I22c5e83161689f83a299516148fe193e881b40e9\n" }, { "commit": "2ef0545ad79dc57d5f7b987aeca3805b5793fa1c", "tree": "9fab8a3fac5c5d60720510ecc363188daad5ab59", "parents": [ "a75d53c4bac5db59bad722678f1c231ef2d92543", "30d23f89547504f308a99a90c6f1c6b85808f568" ], "author": { "name": "David Anderson", "email": "dvander@google.com", "time": "Wed Aug 19 23:13:38 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Aug 19 23:13:38 2020 +0000" }, "message": "Merge \"Allow libsnapshot to link to libbz.\"" }, { "commit": "30d23f89547504f308a99a90c6f1c6b85808f568", "tree": "9fab8a3fac5c5d60720510ecc363188daad5ab59", "parents": [ "a75d53c4bac5db59bad722678f1c231ef2d92543" ], "author": { "name": "David Anderson", "email": "dvander@google.com", "time": "Thu Aug 06 13:57:44 2020 -0700" }, "committer": { "name": "David Anderson", "email": "dvander@google.com", "time": "Thu Aug 06 13:58:12 2020 -0700" }, "message": "Allow libsnapshot to link to libbz.\n\nBug: 1378463\nTest: m vab_convert_payload\nChange-Id: Ic58157fc78ecbc212fb3789651eb3954cfe5158e\n" }, { "commit": "7741f62fbdbd37f3a39eb825470635cb0dac602d", "tree": "337059d963b43c4bad026a1d93e3ecfc2248ec08", "parents": [ "087aba9acd8786bb2160f77538ae18c933fe241f", "e2d2915caafa9d232ddfc33018b34b2f91007cfa" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Apr 29 01:44:22 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 29 01:44:22 2020 +0000" }, "message": "Merge \"Add METADATA to bzip2: Apache2+BSD\u003dNOTICE\" am: eb041812a7 am: a75d53c4ba am: c2e02fb6bf am: 5e4f974ea5 am: e2d2915caa\n\nChange-Id: I8bbe65d7b4d3b8107bf24f6662efbd5a98267cce\n" }, { "commit": "e2d2915caafa9d232ddfc33018b34b2f91007cfa", "tree": "337059d963b43c4bad026a1d93e3ecfc2248ec08", "parents": [ "f957b634f670c867c18cb1c299737de881433274", "5e4f974ea5e5a600bfab2767e17f3bf73bb7c7a5" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Apr 29 01:27:29 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 29 01:27:29 2020 +0000" }, "message": "Merge \"Add METADATA to bzip2: Apache2+BSD\u003dNOTICE\" am: eb041812a7 am: a75d53c4ba am: c2e02fb6bf am: 5e4f974ea5\n\nChange-Id: I672be222e60d7222691aae97d569ab804c4b1f67\n" }, { "commit": "5e4f974ea5e5a600bfab2767e17f3bf73bb7c7a5", "tree": "337059d963b43c4bad026a1d93e3ecfc2248ec08", "parents": [ "5ff4807347da5c1c50297f098964ae85baf6ba08", "c2e02fb6bf5ed541ec1d8185c2560ebd520a169a" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Apr 29 01:03:25 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 29 01:03:25 2020 +0000" }, "message": "Merge \"Add METADATA to bzip2: Apache2+BSD\u003dNOTICE\" am: eb041812a7 am: a75d53c4ba am: c2e02fb6bf\n\nChange-Id: Id641096642561af9915b18b899b9123afeb13669\n" }, { "commit": "c2e02fb6bf5ed541ec1d8185c2560ebd520a169a", "tree": "337059d963b43c4bad026a1d93e3ecfc2248ec08", "parents": [ "9cda868da97e03bbc2f10ac8585da82936b4b1bd", "a75d53c4bac5db59bad722678f1c231ef2d92543" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Apr 29 00:51:51 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 29 00:51:51 2020 +0000" }, "message": "Merge \"Add METADATA to bzip2: Apache2+BSD\u003dNOTICE\" am: eb041812a7 am: a75d53c4ba\n\nChange-Id: I207b48f559ebeef67028e7273ee46aa07accaf75\n" }, { "commit": "a75d53c4bac5db59bad722678f1c231ef2d92543", "tree": "337059d963b43c4bad026a1d93e3ecfc2248ec08", "parents": [ "bfbb28f83689bcf9147bba462a2c00a3c85a7c87", "eb041812a7e8281087ab419b6ef3f9f1f88c67fa" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Apr 29 00:35:31 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 29 00:35:31 2020 +0000" }, "message": "Merge \"Add METADATA to bzip2: Apache2+BSD\u003dNOTICE\" am: eb041812a7\n\nChange-Id: I1a69e5717a7ae29d2d30a66ce28eb9822a6e9a5c\n" }, { "commit": "eb041812a7e8281087ab419b6ef3f9f1f88c67fa", "tree": "337059d963b43c4bad026a1d93e3ecfc2248ec08", "parents": [ "4b94ddbfd09e8ef07f7ffe434afc7f6b84ec68eb", "03d3384918407a1d72c80cc74ef10519adcffc86" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Apr 29 00:20:41 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Apr 29 00:20:41 2020 +0000" }, "message": "Merge \"Add METADATA to bzip2: Apache2+BSD\u003dNOTICE\"" }, { "commit": "03d3384918407a1d72c80cc74ef10519adcffc86", "tree": "337059d963b43c4bad026a1d93e3ecfc2248ec08", "parents": [ "4b94ddbfd09e8ef07f7ffe434afc7f6b84ec68eb" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Apr 28 10:19:16 2020 -0700" }, "committer": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Apr 28 22:39:55 2020 +0000" }, "message": "Add METADATA to bzip2: Apache2+BSD\u003dNOTICE\n\nGPL fonts in manual have addendum allowing inclusion in documents.\n\nBug: 68860345\nBug: 69058154\nBug: 151953481\n\nTest: no code changes\n\nChange-Id: I3cb5aeed9446318825ff939c63df57d1ad675394\n" }, { "commit": "087aba9acd8786bb2160f77538ae18c933fe241f", "tree": "13ebc4ed860035a9259693aecbea52f178499d4d", "parents": [ "7b1dd2fa6a051c4002ac7d338961d3c422729912", "f957b634f670c867c18cb1c299737de881433274" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Apr 10 04:13:46 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 10 04:13:46 2020 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: bfbb28f836 -s ours am: 9cda868da9 am: 5ff4807347 am: f957b634f6 -s ours\n\nam skip reason: subject contains skip directive\n\nChange-Id: I0cf3758fffe0ec6505117e331929f97dfe5d996a\n" }, { "commit": "f957b634f670c867c18cb1c299737de881433274", "tree": "13ebc4ed860035a9259693aecbea52f178499d4d", "parents": [ "431e73294f594fb3bf8be54788d3bba6589c7566", "5ff4807347da5c1c50297f098964ae85baf6ba08" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Apr 10 03:50:07 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 10 03:50:07 2020 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: bfbb28f836 -s ours am: 9cda868da9 am: 5ff4807347\n\nChange-Id: I7f06441bed6d9250df58a7840b8b55a4f6f970b7\n" }, { "commit": "5ff4807347da5c1c50297f098964ae85baf6ba08", "tree": "13ebc4ed860035a9259693aecbea52f178499d4d", "parents": [ "8f404e53d9f6c8691abd3de831017f7ab2a61970", "9cda868da97e03bbc2f10ac8585da82936b4b1bd" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Apr 10 03:26:34 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 10 03:26:34 2020 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: bfbb28f836 -s ours am: 9cda868da9\n\nChange-Id: Ieb14bd28064d8d0033711f0ede81752ba6f9ddea\n" }, { "commit": "9cda868da97e03bbc2f10ac8585da82936b4b1bd", "tree": "13ebc4ed860035a9259693aecbea52f178499d4d", "parents": [ "7667d2d91aed777d515c6a83544b1314074ee355", "bfbb28f83689bcf9147bba462a2c00a3c85a7c87" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Apr 10 03:01:55 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 10 03:01:55 2020 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: bfbb28f836 -s ours\n\nam skip reason: subject contains skip directive\n\nChange-Id: Ib2e911728f2b793e890ee47b902d46f1914d2166\n" }, { "commit": "bfbb28f83689bcf9147bba462a2c00a3c85a7c87", "tree": "13ebc4ed860035a9259693aecbea52f178499d4d", "parents": [ "216f77451a4ff728034bd66e0d578df8caf52a61", "9c7e837e4c0d75a99173325109eabfe43e633709" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Apr 09 17:50:36 2020 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Apr 09 17:50:36 2020 -0700" }, "message": "DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master\n\nBug: 151763422\nChange-Id: I1eacd3e9b39d310a443221eed127ffa65db93d86\n" }, { "commit": "7b1dd2fa6a051c4002ac7d338961d3c422729912", "tree": "13ebc4ed860035a9259693aecbea52f178499d4d", "parents": [ "c6c36df1fce6e8d61865d934d405804b1e2893ed", "431e73294f594fb3bf8be54788d3bba6589c7566" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Mar 26 18:04:54 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 26 18:04:54 2020 +0000" }, "message": "Merge \"Remove redundant NOTICE copied from LICENSE.\" am: 4b94ddbfd0 am: 216f77451a am: 7667d2d91a am: 8f404e53d9 am: 431e73294f\n\nChange-Id: Ia2a8733cd2a86216d068a96a3ca2b77cc965f86a\n" }, { "commit": "431e73294f594fb3bf8be54788d3bba6589c7566", "tree": "13ebc4ed860035a9259693aecbea52f178499d4d", "parents": [ "c6c36df1fce6e8d61865d934d405804b1e2893ed", "8f404e53d9f6c8691abd3de831017f7ab2a61970" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Mar 26 17:41:54 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 26 17:41:54 2020 +0000" }, "message": "Merge \"Remove redundant NOTICE copied from LICENSE.\" am: 4b94ddbfd0 am: 216f77451a am: 7667d2d91a am: 8f404e53d9\n\nChange-Id: I583e3151744cdfde30bd94719fc6bd79c8ef14f0\n" }, { "commit": "8f404e53d9f6c8691abd3de831017f7ab2a61970", "tree": "13ebc4ed860035a9259693aecbea52f178499d4d", "parents": [ "c6c36df1fce6e8d61865d934d405804b1e2893ed", "7667d2d91aed777d515c6a83544b1314074ee355" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Mar 26 17:14:30 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 26 17:14:30 2020 +0000" }, "message": "Merge \"Remove redundant NOTICE copied from LICENSE.\" am: 4b94ddbfd0 am: 216f77451a am: 7667d2d91a\n\nChange-Id: I8fd0b1bf347e374223380bdababaca23af9aa18b\n" }, { "commit": "7667d2d91aed777d515c6a83544b1314074ee355", "tree": "13ebc4ed860035a9259693aecbea52f178499d4d", "parents": [ "c6c36df1fce6e8d61865d934d405804b1e2893ed", "216f77451a4ff728034bd66e0d578df8caf52a61" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Mar 26 17:02:22 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 26 17:02:22 2020 +0000" }, "message": "Merge \"Remove redundant NOTICE copied from LICENSE.\" am: 4b94ddbfd0 am: 216f77451a\n\nChange-Id: Ic9e4be88d94bd7a907a6766e49a6dd684562c41f\n" }, { "commit": "9c7e837e4c0d75a99173325109eabfe43e633709", "tree": "13ebc4ed860035a9259693aecbea52f178499d4d", "parents": [ "ef2142980b09fa899806433fff413c67a81b94f6", "216f77451a4ff728034bd66e0d578df8caf52a61" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Mar 26 17:02:21 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 26 17:02:21 2020 +0000" }, "message": "Merge \"Remove redundant NOTICE copied from LICENSE.\" am: 4b94ddbfd0 am: 216f77451a\n\nChange-Id: Ic26781983387c1ddee683cb88ff0f1134d6c658a\n" }, { "commit": "216f77451a4ff728034bd66e0d578df8caf52a61", "tree": "13ebc4ed860035a9259693aecbea52f178499d4d", "parents": [ "ef2142980b09fa899806433fff413c67a81b94f6", "4b94ddbfd09e8ef07f7ffe434afc7f6b84ec68eb" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Mar 26 16:45:48 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 26 16:45:48 2020 +0000" }, "message": "Merge \"Remove redundant NOTICE copied from LICENSE.\" am: 4b94ddbfd0\n\nChange-Id: Idef5ea83a443d7cf0c4c25b0715a1fe5924a4787\n" }, { "commit": "4b94ddbfd09e8ef07f7ffe434afc7f6b84ec68eb", "tree": "13ebc4ed860035a9259693aecbea52f178499d4d", "parents": [ "ef2142980b09fa899806433fff413c67a81b94f6", "fd292a358b3a28750ba311ead484af51fdb71777" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Mar 26 16:26:34 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Mar 26 16:26:34 2020 +0000" }, "message": "Merge \"Remove redundant NOTICE copied from LICENSE.\"" }, { "commit": "fd292a358b3a28750ba311ead484af51fdb71777", "tree": "13ebc4ed860035a9259693aecbea52f178499d4d", "parents": [ "ef2142980b09fa899806433fff413c67a81b94f6" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Wed Mar 25 18:56:42 2020 -0700" }, "committer": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Wed Mar 25 18:56:42 2020 -0700" }, "message": "Remove redundant NOTICE copied from LICENSE.\n\nIdentified using the below shell script:\n\n$ find -H . -name LICENSE -type f -print0 | xargs -0 dirname \\\n | while read dir; do \\\n if [ -f \"${dir}/NOTICE\" ] \\\n \u0026\u0026 diff \"${dir}/LICENSE\" \"${dir}/NOTICE\" \u003e/dev/null; then \\\n echo \"${dir}/NOTICE\"; \\\n fi; \\\n done\n\nNow that http://r.android.com/r/1235427 and http://r.android.com/r/1238719 are\nmerged, LICENSE files copied into NOTICE files are no longer needed.\n\nBug: 67772237\nBug: 68860345\n\nTest: manually built and diffed before and after system image notices\nChange-Id: I44bf9582d5ea6b9fbc4530b3df1ab67f2516a470\n" }, { "commit": "c6c36df1fce6e8d61865d934d405804b1e2893ed", "tree": "6bd415a59a76f53027019a648584187a03033f4e", "parents": [ "33b62378a79fb799d1f1615cbb805bea5bc70bb3", "ef2142980b09fa899806433fff413c67a81b94f6" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 30 14:43:53 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 30 14:43:53 2019 -0700" }, "message": "[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 3b55d19823\nam: ef2142980b -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: If1d2ab0e4a41c000714eede07c23063f1d2fa611\n" }, { "commit": "ef2142980b09fa899806433fff413c67a81b94f6", "tree": "6bd415a59a76f53027019a648584187a03033f4e", "parents": [ "c176e2365ed269ee2bbdc15ff3f304e06d1c5b63", "3b55d19823772c35cc7106878e00fc3f6cfa0502" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 30 14:22:03 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 30 14:22:03 2019 -0700" }, "message": "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master\nam: 3b55d19823\n\nChange-Id: Ibd7c3e43e535ab991fceac961ae669ab497c3c0a\n" }, { "commit": "3b55d19823772c35cc7106878e00fc3f6cfa0502", "tree": "6bd415a59a76f53027019a648584187a03033f4e", "parents": [ "81e4be9317712c7b2d1392f0af6cb89678f1fc0f", "c881a5a12c100889082df66fbe18d9afc131fa7d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 30 11:47:34 2019 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 30 11:47:34 2019 -0700" }, "message": "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master\n\nBug: 142003500\nChange-Id: Iaef7e9813279d7154295e720506abbd08e2be0ba\n" }, { "commit": "33b62378a79fb799d1f1615cbb805bea5bc70bb3", "tree": "6bd415a59a76f53027019a648584187a03033f4e", "parents": [ "f6bbda229b78bc56754f58d688e9c6dc167f2a17", "c176e2365ed269ee2bbdc15ff3f304e06d1c5b63" ], "author": { "name": "Bill Peckham", "email": "bpeckham@google.com", "time": "Fri Oct 18 17:08:02 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Oct 18 17:08:02 2019 -0700" }, "message": "Merge \"Restrict visibility of libraries that are newly vendor_available: true.\" am: 82d49b0efa am: 81e4be9317 am: 25867702bf\nam: c176e2365e\n\nChange-Id: Ie575f7d1439ec106f94ae0f7e7973c811759172e\n" }, { "commit": "c176e2365ed269ee2bbdc15ff3f304e06d1c5b63", "tree": "6bd415a59a76f53027019a648584187a03033f4e", "parents": [ "c71f3f9799c08ac1319615b2a70e4680ce134b5b", "25867702bfd77b881c80766db9f2abdb9cf1dfb1" ], "author": { "name": "Bill Peckham", "email": "bpeckham@google.com", "time": "Fri Oct 18 16:55:26 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Oct 18 16:55:26 2019 -0700" }, "message": "Merge \"Restrict visibility of libraries that are newly vendor_available: true.\" am: 82d49b0efa am: 81e4be9317\nam: 25867702bf\n\nChange-Id: I82e1b1325be633bdd0de6cbe2d204b3ddd88dfba\n" }, { "commit": "25867702bfd77b881c80766db9f2abdb9cf1dfb1", "tree": "6bd415a59a76f53027019a648584187a03033f4e", "parents": [ "78bda636ca629e4f087904520eb2db22b4c4fdcc", "81e4be9317712c7b2d1392f0af6cb89678f1fc0f" ], "author": { "name": "Bill Peckham", "email": "bpeckham@google.com", "time": "Fri Oct 18 16:43:47 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Oct 18 16:43:47 2019 -0700" }, "message": "Merge \"Restrict visibility of libraries that are newly vendor_available: true.\" am: 82d49b0efa\nam: 81e4be9317\n\nChange-Id: If472025ff191131ff5996ee97417485e94a70c8e\n" }, { "commit": "81e4be9317712c7b2d1392f0af6cb89678f1fc0f", "tree": "6bd415a59a76f53027019a648584187a03033f4e", "parents": [ "d62a7013ab9cfd8263b04c30096081e5a1013a07", "82d49b0efaa00f63ddae4c7f9b0a0068e4dd4a40" ], "author": { "name": "Bill Peckham", "email": "bpeckham@google.com", "time": "Fri Oct 18 16:36:46 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Oct 18 16:36:46 2019 -0700" }, "message": "Merge \"Restrict visibility of libraries that are newly vendor_available: true.\"\nam: 82d49b0efa\n\nChange-Id: I9b8577eadf0b86fe6ae09c544602678843ecf643\n" }, { "commit": "82d49b0efaa00f63ddae4c7f9b0a0068e4dd4a40", "tree": "6bd415a59a76f53027019a648584187a03033f4e", "parents": [ "f41aefd55167acf8cec7cd936e22a301ff403280", "9f8ec258d517b50f96bf9344aab70c04c7dbf14c" ], "author": { "name": "Bill Peckham", "email": "bpeckham@google.com", "time": "Fri Oct 18 23:21:39 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Oct 18 23:21:39 2019 +0000" }, "message": "Merge \"Restrict visibility of libraries that are newly vendor_available: true.\"" }, { "commit": "9f8ec258d517b50f96bf9344aab70c04c7dbf14c", "tree": "6bd415a59a76f53027019a648584187a03033f4e", "parents": [ "f41aefd55167acf8cec7cd936e22a301ff403280" ], "author": { "name": "Bill Peckham", "email": "bpeckham@google.com", "time": "Thu Oct 17 18:03:15 2019 -0700" }, "committer": { "name": "Bill Peckham", "email": "bpeckham@google.com", "time": "Thu Oct 17 18:03:15 2019 -0700" }, "message": "Restrict visibility of libraries that are newly vendor_available: true.\n\nAs part of fixing b/68319577, some libraries were made vendor_available: true.\nTo minimize new dependencies from vendor on these libraries, this change\nrestricts the visibility of the libraries to only the framework projects that\ncurrently use them.\n\nThis change does two things. It makes libbz a static libarary only (drops the\nshared library). It restricts the visibility of the static library to only the\nframework projects that currently use it.\n\nBug: 141649008\nTest: Targets build successfully.\nChange-Id: Icb2974bd890a705f827f98a2526eed21625bf9f4\n" }, { "commit": "f6bbda229b78bc56754f58d688e9c6dc167f2a17", "tree": "9961be68beb430571074310ebe2e3366df0628bc", "parents": [ "efc1e857a48ca6b1efab9e6b30c172d0b328af76", "c71f3f9799c08ac1319615b2a70e4680ce134b5b" ], "author": { "name": "Tao Bao", "email": "tbao@google.com", "time": "Wed Oct 09 09:14:03 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 09 09:14:03 2019 -0700" }, "message": "Merge \"Update OWNERS.\" am: f41aefd551 am: d62a7013ab am: 78bda636ca\nam: c71f3f9799\n\nChange-Id: I8aa0eac0a1b7fec3d6cf23e5feb91d38aa7c9d03\n" }, { "commit": "c71f3f9799c08ac1319615b2a70e4680ce134b5b", "tree": "9961be68beb430571074310ebe2e3366df0628bc", "parents": [ "bff3aed7c5dc237411dad9c7bdf38de3a3b2d292", "78bda636ca629e4f087904520eb2db22b4c4fdcc" ], "author": { "name": "Tao Bao", "email": "tbao@google.com", "time": "Wed Oct 09 09:08:05 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 09 09:08:05 2019 -0700" }, "message": "Merge \"Update OWNERS.\" am: f41aefd551 am: d62a7013ab\nam: 78bda636ca\n\nChange-Id: I6e2df6a99054ce4e45783ae25ad41b8248b8e9a3\n" }, { "commit": "78bda636ca629e4f087904520eb2db22b4c4fdcc", "tree": "9961be68beb430571074310ebe2e3366df0628bc", "parents": [ "d4eaa4a1746ab9f5944980009dcdfd003a897d91", "d62a7013ab9cfd8263b04c30096081e5a1013a07" ], "author": { "name": "Tao Bao", "email": "tbao@google.com", "time": "Wed Oct 09 08:58:38 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 09 08:58:38 2019 -0700" }, "message": "Merge \"Update OWNERS.\" am: f41aefd551\nam: d62a7013ab\n\nChange-Id: I03227a01564950cfecaa508c27bab01c652773c7\n" } ], "next": "d62a7013ab9cfd8263b04c30096081e5a1013a07" }