)]}' { "log": [ { "commit": "e848dcb1a6957d157e6f01be3354b39a9a6c1161", "tree": "993884265ae1cbb80d89e3dffeaf42c3f0e52133", "parents": [ "d83e225d40bd38b1cb3e0eb1bf984e8d23b89278", "df296abaa1ed8a3e5ead1449ec02177343718b88" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 25 10:27:57 2019 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 25 10:27:57 2019 -0700" }, "message": "Merge Coral/Flame into AOSP master\n\nBug: 141248619\nChange-Id: I4537506e4671845215e1e1bc0e98ca8d8764ccd6\nMerged-In: If09e45cb0814c0253b632e76b5ad6baaf03679d4\n" }, { "commit": "df296abaa1ed8a3e5ead1449ec02177343718b88", "tree": "993884265ae1cbb80d89e3dffeaf42c3f0e52133", "parents": [ "769af261df8686752b7805d06e3fcebe8e7f01c6", "bf1447f230408ffc01ba6a4b24d668d18a542d59" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 16 15:19:17 2019 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 16 15:19:17 2019 -0700" }, "message": "Skip QD1A.190821.011 in stage-aosp-master\n\nBug: 141248619\nChange-Id: If09e45cb0814c0253b632e76b5ad6baaf03679d4\n" }, { "commit": "769af261df8686752b7805d06e3fcebe8e7f01c6", "tree": "993884265ae1cbb80d89e3dffeaf42c3f0e52133", "parents": [ "5290eb035330085b020df241ce0e47fb9357d1a6", "d83e225d40bd38b1cb3e0eb1bf984e8d23b89278" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Wed Oct 02 13:30:26 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 02 13:30:26 2019 -0700" }, "message": "Remove libhwbinder/libhidltransport deps\nam: d83e225d40\n\nChange-Id: I0917f9ca38e80a6c1b8753b6f47ef74135f9502f\n" }, { "commit": "d83e225d40bd38b1cb3e0eb1bf984e8d23b89278", "tree": "d2f64e96175f97f8c381714f3b8b1a0a096a9102", "parents": [ "54eb311958a4200c76504139d9908d8c7149486c" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Tue Oct 01 11:01:45 2019 -0700" }, "committer": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Tue Oct 01 11:01:45 2019 -0700" }, "message": "Remove libhwbinder/libhidltransport deps\n\nSince these were combined into libhidlbase.\n\nBug: 135686713\nTest: build only (libhwbinder/libhidltransport are empty)\nChange-Id: Ib3498365bb45fe89659cda9a35170740652b5773\n" }, { "commit": "5290eb035330085b020df241ce0e47fb9357d1a6", "tree": "1ce39e90d66cacd733f298d8dc7a91ce8d6b18cf", "parents": [ "54eb311958a4200c76504139d9908d8c7149486c", "d70e19456b25e63bd12651cfdd82b026465c22de" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sun Sep 08 13:06:50 2019 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sun Sep 08 13:06:50 2019 -0700" }, "message": "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master\n\nBug: 135460123\nChange-Id: I7bddfec8cc2d1cf26b4c351ddfe06c56a6d8aae9\nMerged-In: I2fba61edbd92420b6c4df9bea56392d6afe63e89\n" }, { "commit": "54eb311958a4200c76504139d9908d8c7149486c", "tree": "0adb02bbe95bec0d982e82c0931968025d2bf4f4", "parents": [ "b207d11fc3874cb921b6175375a82857815a6ede", "6c03fcc1184de3976f365a426aacc708e1b6869d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Sep 04 13:33:46 2019 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Sep 04 13:33:46 2019 -0700" }, "message": "DO NOT MERGE - Merge Android 10 into master\n\nBug: 139893257\nChange-Id: I2fba61edbd92420b6c4df9bea56392d6afe63e89\n" }, { "commit": "d70e19456b25e63bd12651cfdd82b026465c22de", "tree": "1ce39e90d66cacd733f298d8dc7a91ce8d6b18cf", "parents": [ "b454b8708d01fb381d1226c969554d0b1d87f2f6", "ea00e5e3c13bb0137aae8cb54b43b4e9f6e20710" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jul 10 22:49:16 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 10 22:49:16 2019 -0700" }, "message": "[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: b207d11fc3 -s ours am: 6c03fcc118 -s ours\nam: ea00e5e3c1\n\nChange-Id: I1d6a45f0b10c8c97d36c5ab4cf6ad2c60f4881e0\n" }, { "commit": "ea00e5e3c13bb0137aae8cb54b43b4e9f6e20710", "tree": "0adb02bbe95bec0d982e82c0931968025d2bf4f4", "parents": [ "138a93960cbc4379e3f508d62fae821a2731bc08", "6c03fcc1184de3976f365a426aacc708e1b6869d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jul 10 22:14:00 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 10 22:14:00 2019 -0700" }, "message": "[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: b207d11fc3 -s ours\nam: 6c03fcc118 -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: I97bb3907cb04badd6f5da896c4560afa120463f7\n" }, { "commit": "6c03fcc1184de3976f365a426aacc708e1b6869d", "tree": "0adb02bbe95bec0d982e82c0931968025d2bf4f4", "parents": [ "138a93960cbc4379e3f508d62fae821a2731bc08", "b207d11fc3874cb921b6175375a82857815a6ede" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jul 10 21:20:12 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 10 21:20:12 2019 -0700" }, "message": "[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master\nam: b207d11fc3 -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: I9b1ddf72669cd31730942fe20651b1011ecbd915\n" }, { "commit": "b207d11fc3874cb921b6175375a82857815a6ede", "tree": "77482efd1319f313774b4027c0615fd1736eb037", "parents": [ "a1f29a7689f2adbcfb6e3c02d5fde5e7da67b89a", "36f5d61b6419bef896b22e40b403b080209caeb6" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jul 09 11:23:59 2019 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jul 09 11:23:59 2019 -0700" }, "message": "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master\n\nBug: 136196576\nChange-Id: Ie77e642f3d61ab17d23c02126166047b4da88da0\n" }, { "commit": "36f5d61b6419bef896b22e40b403b080209caeb6", "tree": "8a1ea17fa37d8c492708fea944db01a56a66e692", "parents": [ "142b62ef76d1ec7dd1aa6976a00dd706f6f3cd18", "9a7aec451295cee84ef7682dd1328c2e063edc70" ], "author": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Mon Jul 08 23:29:23 2019 +0000" }, "committer": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Mon Jul 08 23:29:23 2019 +0000" }, "message": "Snap for 5622519 from 9a7aec451295cee84ef7682dd1328c2e063edc70 to pi-platform-release\n\nChange-Id: I065bfc919e98674690ac040f31dacff46b6c0f73\n" }, { "commit": "142b62ef76d1ec7dd1aa6976a00dd706f6f3cd18", "tree": "8a1ea17fa37d8c492708fea944db01a56a66e692", "parents": [ "6e86db1187ef21a81e64b6971f1b5bc82542dc3b", "9984a790a0c9f316df28b0c826bc90003d60061f" ], "author": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Mon Jul 08 18:21:26 2019 +0000" }, "committer": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Mon Jul 08 18:21:26 2019 +0000" }, "message": "Snap for 5600800 from 9984a790a0c9f316df28b0c826bc90003d60061f to pi-platform-release\n\nChange-Id: Iaaa96ecf1819b62c6f6586e9703d98c290aded57\n" }, { "commit": "b454b8708d01fb381d1226c969554d0b1d87f2f6", "tree": "1ce39e90d66cacd733f298d8dc7a91ce8d6b18cf", "parents": [ "42126e42e0abad73073f0353cd55a7b9cdf2bb3f", "138a93960cbc4379e3f508d62fae821a2731bc08" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jul 02 13:07:38 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 02 13:07:38 2019 -0700" }, "message": "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master\nam: 138a93960c\n\nChange-Id: I8880ba1bc7a7c27c0f015ab3ee656d90a7ee3d60\n" }, { "commit": "138a93960cbc4379e3f508d62fae821a2731bc08", "tree": "0adb02bbe95bec0d982e82c0931968025d2bf4f4", "parents": [ "2fcd4d3b3ab325a14c9de8821f2383a4908bdc0f", "d208a746f5e2f09621426e2950525f37c87a9d91" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jul 01 20:59:32 2019 +0000" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jul 01 20:59:32 2019 +0000" }, "message": "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master\n\nBug: 134405016\nChange-Id: I5ad090dbf722b474a8d343f7c1ae585cea97544c\n" }, { "commit": "bf1447f230408ffc01ba6a4b24d668d18a542d59", "tree": "ecd5625d41111ee1cb9fd2bc4070025775ff6f17", "parents": [ "79bd2999c77d171758ead2ea2649d0167485f6d9", "4d65e46c93e389463ee5d32212c5ad6ed1e34768" ], "author": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Sat Jun 15 23:08:03 2019 +0000" }, "committer": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Sat Jun 15 23:08:03 2019 +0000" }, "message": "Snap for 5663715 from 4d65e46c93e389463ee5d32212c5ad6ed1e34768 to qt-c2f2-release\n\nChange-Id: Ie25b2cf40b80d63fec8d13a089c77c7afb50d625\n" }, { "commit": "42126e42e0abad73073f0353cd55a7b9cdf2bb3f", "tree": "1ce39e90d66cacd733f298d8dc7a91ce8d6b18cf", "parents": [ "a2aabe11a690cc5bdccb779c29b1d57a4ac66fe2", "d208a746f5e2f09621426e2950525f37c87a9d91" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Fri Jun 14 16:36:01 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 14 16:36:01 2019 -0700" }, "message": "libhidltransport users user libhidlbase am: 5f983d4d99\nam: d208a746f5\n\nChange-Id: Ia65ee333cf4a8611b67c3c67062cc5f6a04626b4\n" }, { "commit": "a2aabe11a690cc5bdccb779c29b1d57a4ac66fe2", "tree": "1ce39e90d66cacd733f298d8dc7a91ce8d6b18cf", "parents": [ "e808d69d7175bddc0041a5c4fe7c6793a810d847", "4d65e46c93e389463ee5d32212c5ad6ed1e34768" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Fri Jun 14 16:29:41 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 14 16:29:41 2019 -0700" }, "message": "libhidltransport users user libhidlbase am: 5f983d4d99\nam: 4d65e46c93\n\nChange-Id: I1285227e979a99ef24e7f593d40752a15975de2b\n" }, { "commit": "4d65e46c93e389463ee5d32212c5ad6ed1e34768", "tree": "ecd5625d41111ee1cb9fd2bc4070025775ff6f17", "parents": [ "f2d54ae92ca94754cff5beae8c0c224e8c269374", "5f983d4d99eb23f11670c49c024194dac746172d" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Fri Jun 14 16:17:36 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 14 16:17:36 2019 -0700" }, "message": "libhidltransport users user libhidlbase\nam: 5f983d4d99\n\nChange-Id: Icaa542dde893baf4122e242c509b4252a60dbb7c\n" }, { "commit": "d208a746f5e2f09621426e2950525f37c87a9d91", "tree": "0adb02bbe95bec0d982e82c0931968025d2bf4f4", "parents": [ "761d028af0cbf8ed3659fe7dc9ba5d4abc5964c9", "5f983d4d99eb23f11670c49c024194dac746172d" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Fri Jun 14 16:17:26 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 14 16:17:26 2019 -0700" }, "message": "libhidltransport users user libhidlbase\nam: 5f983d4d99\n\nChange-Id: I748bb388730532270fc3f97071719a90dad55195\n" }, { "commit": "5f983d4d99eb23f11670c49c024194dac746172d", "tree": "f1ede0b6b60a43022001e234173836b4e89fed56", "parents": [ "e8065d103b2bc32e33a47dd53030de2ecece693f" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Mon Jun 10 13:39:14 2019 -0700" }, "committer": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Mon Jun 10 13:39:14 2019 -0700" }, "message": "libhidltransport users user libhidlbase\n\nlibhidltransport symbols are being moved into libhidlbase in order to\noptimize linking/memory usage. libhidltransport will no longer be\nrequired in the future (however removing references to it will come\nseparately).\n\nBug: 134961554\nTest: boot\nChange-Id: Iefdaa8abba76d110e5a7c01088efd917801d3e5a\n" }, { "commit": "e808d69d7175bddc0041a5c4fe7c6793a810d847", "tree": "eeadfa132e818228ba09ec2740d44cd9e4ea0908", "parents": [ "2102808f085e8e8ce15854db065da515131078d3", "761d028af0cbf8ed3659fe7dc9ba5d4abc5964c9" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jun 09 14:33:13 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Jun 09 14:33:13 2019 -0700" }, "message": "[automerger skipped] Remove byi from OWNERS file am: a1f29a7689 am: 2fcd4d3b3a -s ours\nam: 761d028af0 -s ours\nam skip reason: change_id I11ba9771073c6351e08e848d1df3a073552f439a with SHA1 7b459edf21 is in history\n\nChange-Id: I4abf4b14282d0bffaf58ba4ad04fede3d97d8cc1\n" }, { "commit": "761d028af0cbf8ed3659fe7dc9ba5d4abc5964c9", "tree": "d3a5551a247f1a6ac18b2cf1b94ff1df5b546140", "parents": [ "7b459edf21c649f3d42d801ff4367ecff4b839ff", "2fcd4d3b3ab325a14c9de8821f2383a4908bdc0f" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jun 09 14:28:09 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Jun 09 14:28:09 2019 -0700" }, "message": "[automerger skipped] Remove byi from OWNERS file am: a1f29a7689\nam: 2fcd4d3b3a -s ours\nam skip reason: change_id I11ba9771073c6351e08e848d1df3a073552f439a with SHA1 7b459edf21 is in history\n\nChange-Id: I11fdfd49e45feb41bef3688c6e8a4467b6623198\n" }, { "commit": "2fcd4d3b3ab325a14c9de8821f2383a4908bdc0f", "tree": "9b0500f4fd80d4d5295555a2163312786f9e8c79", "parents": [ "b1b394bbc61252f164eb6ab4b0144e5b9e3cfddd", "a1f29a7689f2adbcfb6e3c02d5fde5e7da67b89a" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jun 09 14:23:11 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Jun 09 14:23:11 2019 -0700" }, "message": "Remove byi from OWNERS file\nam: a1f29a7689\n\nChange-Id: I446de5214f0e365a21f77560f0b0ab29f5749dc1\n" }, { "commit": "a1f29a7689f2adbcfb6e3c02d5fde5e7da67b89a", "tree": "9b0500f4fd80d4d5295555a2163312786f9e8c79", "parents": [ "1aaeb700388523ae9d166f63fcef88027c2f8ee1" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Fri Jun 07 13:28:12 2019 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jun 09 20:29:52 2019 +0000" }, "message": "Remove byi from OWNERS file\n\nMerged-In: I11ba9771073c6351e08e848d1df3a073552f439a\nChange-Id: I0a7c33ed6614a6611973bc7d67b07a3d774224c9\n" }, { "commit": "2102808f085e8e8ce15854db065da515131078d3", "tree": "eeadfa132e818228ba09ec2740d44cd9e4ea0908", "parents": [ "bacefad1965edb7d580987ff9d8bf4ec2f95888d", "7b459edf21c649f3d42d801ff4367ecff4b839ff" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jun 09 11:12:30 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Jun 09 11:12:30 2019 -0700" }, "message": "Remove byi from OWNERS file\nam: 7b459edf21\n\nChange-Id: I4056fc8d5d28d3abfd85549f960b9fc160a298ea\n" }, { "commit": "7b459edf21c649f3d42d801ff4367ecff4b839ff", "tree": "d3a5551a247f1a6ac18b2cf1b94ff1df5b546140", "parents": [ "829aa307f87bf45e99a4753736c6d07fe77a1cf1" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Fri Jun 07 14:25:22 2019 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Fri Jun 07 14:25:22 2019 -0700" }, "message": "Remove byi from OWNERS file\n\nChange-Id: I11ba9771073c6351e08e848d1df3a073552f439a\n" }, { "commit": "bacefad1965edb7d580987ff9d8bf4ec2f95888d", "tree": "4de9fc709c897a5586547d72a472ab337cbf6eed", "parents": [ "d6abbafd20959879a6250d1d92e57173793bc6d8", "829aa307f87bf45e99a4753736c6d07fe77a1cf1" ], "author": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Fri Jun 07 13:52:26 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 07 13:52:26 2019 -0700" }, "message": "Match src paths with aidl package name am: 1aaeb70038 am: b1b394bbc6\nam: 829aa307f8\n\nChange-Id: I79bc6ca9d8ab4c2c3ae002826b1df27c0ba1f711\n" }, { "commit": "829aa307f87bf45e99a4753736c6d07fe77a1cf1", "tree": "759f02b99ec8f04813de7f55f413a82cf0e5e941", "parents": [ "710d75a410f72dfbe1301d40e9c6f8e3793cf4c6", "b1b394bbc61252f164eb6ab4b0144e5b9e3cfddd" ], "author": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Fri Jun 07 13:44:19 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 07 13:44:19 2019 -0700" }, "message": "Match src paths with aidl package name am: 1aaeb70038\nam: b1b394bbc6\n\nChange-Id: I0386bed778be342e7e9a7253e98008c05c16982a\n" }, { "commit": "b1b394bbc61252f164eb6ab4b0144e5b9e3cfddd", "tree": "c428e6666fde40f7fce9a043d2d8952defe95376", "parents": [ "fd42670d56b52c4bc968aeefe8e6c6d1067093bb", "1aaeb700388523ae9d166f63fcef88027c2f8ee1" ], "author": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Fri Jun 07 13:37:15 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 07 13:37:15 2019 -0700" }, "message": "Match src paths with aidl package name\nam: 1aaeb70038\n\nChange-Id: Ia2600c67f08323eb8f7c1a8ec34880d29dd4c94f\n" }, { "commit": "1aaeb700388523ae9d166f63fcef88027c2f8ee1", "tree": "c428e6666fde40f7fce9a043d2d8952defe95376", "parents": [ "07cc56f9cfd29a462b17d4d5a5ff23d52d34b5ef" ], "author": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Thu Jun 06 08:25:22 2019 -0700" }, "committer": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Thu Jun 06 08:25:22 2019 -0700" }, "message": "Match src paths with aidl package name\n\nIn order for the build system to track updates to the header files\nduring incremental builds, always specify the src files using the same\npath as the package for C++ compilations.\n\nBug: 112114177\nTest: treehugger\nChange-Id: I52cf76a06aebb84ac91ba9d081cb995c8b4366f8\n" }, { "commit": "9a7aec451295cee84ef7682dd1328c2e063edc70", "tree": "8a1ea17fa37d8c492708fea944db01a56a66e692", "parents": [ "44ee17aff7ccec2776ec358d570b3df9473627a5", "2b2d7642e9d05d1f6768d22ae437e5de2003d04d" ], "author": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Wed May 29 07:33:32 2019 +0000" }, "committer": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Wed May 29 07:33:32 2019 +0000" }, "message": "Merge cherrypicks of [7783409, 7785797, 7784263] into pi-qpr3-b-release\n\nChange-Id: I9e3a371bebbef214e8b31e2a3f4bf02f5838a295\n" }, { "commit": "2b2d7642e9d05d1f6768d22ae437e5de2003d04d", "tree": "8a1ea17fa37d8c492708fea944db01a56a66e692", "parents": [ "44ee17aff7ccec2776ec358d570b3df9473627a5" ], "author": { "name": "Garret Kelly", "email": "gdk@google.com", "time": "Thu May 23 08:46:31 2019 -0400" }, "committer": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Wed May 29 07:33:00 2019 +0000" }, "message": "Merge remote-tracking branch \u0027goog/upstream-pixel18\u0027 into pi-dev-uaf-fix\n\n* goog/upstream-pixel18:\n keymaster: address UAF bug in attest()\n\nBug: 133197843\nBug: 129562815\nTest: manual\nChange-Id: If990030f5cff02c241a88a51d63bc2b9dbfc365f\nSigned-off-by: Garret Kelly \u003cgdk@google.com\u003e\n(cherry picked from commit 15361469739d69efba81b06198c01e09581e5d4e)\n" }, { "commit": "79bd2999c77d171758ead2ea2649d0167485f6d9", "tree": "c9fd6449f48456ce51ec56bcbbebce47fe418520", "parents": [ "ba2a5adaf6c244aa76dae80ada2a03ae2a50ded4", "f2d54ae92ca94754cff5beae8c0c224e8c269374" ], "author": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Sat May 25 23:18:51 2019 +0000" }, "committer": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Sat May 25 23:18:51 2019 +0000" }, "message": "Snap for 5606075 from f2d54ae92ca94754cff5beae8c0c224e8c269374 to qt-c2f2-release\n\nChange-Id: Ifcc2850ae3a739f08d7248a4719f3d9cf1ef5449\n" }, { "commit": "9984a790a0c9f316df28b0c826bc90003d60061f", "tree": "8a1ea17fa37d8c492708fea944db01a56a66e692", "parents": [ "97f37e99745f205b4bd3cece9f0470388587f14c", "62976b458c03f326066e5c3cf43097873cec9223" ], "author": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Fri May 24 06:00:01 2019 +0000" }, "committer": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Fri May 24 06:00:01 2019 +0000" }, "message": "Merge cherrypicks of [7705823] into pi-qpr3-release\n\nChange-Id: Ibf43a7586ae09992bdb019e971279fc8286c8561\n" }, { "commit": "62976b458c03f326066e5c3cf43097873cec9223", "tree": "8a1ea17fa37d8c492708fea944db01a56a66e692", "parents": [ "97f37e99745f205b4bd3cece9f0470388587f14c" ], "author": { "name": "Garret Kelly", "email": "gdk@google.com", "time": "Thu May 23 08:46:31 2019 -0400" }, "committer": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Fri May 24 05:59:52 2019 +0000" }, "message": "Merge remote-tracking branch \u0027goog/upstream-pixel18\u0027 into pi-dev-uaf-fix\n\n* goog/upstream-pixel18:\n keymaster: address UAF bug in attest()\n\nBug: 133197843\nBug: 129562815\nTest: manual\nChange-Id: If990030f5cff02c241a88a51d63bc2b9dbfc365f\nSigned-off-by: Garret Kelly \u003cgdk@google.com\u003e\n(cherry picked from commit 15361469739d69efba81b06198c01e09581e5d4e)\n" }, { "commit": "d6abbafd20959879a6250d1d92e57173793bc6d8", "tree": "c9fd6449f48456ce51ec56bcbbebce47fe418520", "parents": [ "39126f1911b32dd39433d1aa6afc838a017b45ef", "710d75a410f72dfbe1301d40e9c6f8e3793cf4c6" ], "author": { "name": "Garret Kelly", "email": "gdk@google.com", "time": "Thu May 23 08:47:38 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 23 08:47:38 2019 -0700" }, "message": "Merge remote-tracking branch \u0027goog/upstream-pixel18\u0027 into pi-dev-uaf-fix am: 1536146973 am: e8065d103b\nam: 710d75a410\n\nChange-Id: Iac762f1112bd370f236aae68d689e3d672e44921\n" }, { "commit": "39126f1911b32dd39433d1aa6afc838a017b45ef", "tree": "c9fd6449f48456ce51ec56bcbbebce47fe418520", "parents": [ "31c2c38daf21df67421f29b699e7ce300489c8d2", "f2d54ae92ca94754cff5beae8c0c224e8c269374" ], "author": { "name": "Garret Kelly", "email": "gdk@google.com", "time": "Thu May 23 08:36:02 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 23 08:36:02 2019 -0700" }, "message": "Merge remote-tracking branch \u0027goog/upstream-pixel18\u0027 into pi-dev-uaf-fix am: 1536146973 am: e8065d103b\nam: f2d54ae92c\n\nChange-Id: I846be08db06b4196d052d5d4d2ad8b193c2247e8\n" }, { "commit": "f2d54ae92ca94754cff5beae8c0c224e8c269374", "tree": "c9fd6449f48456ce51ec56bcbbebce47fe418520", "parents": [ "b3a1a394fb423aa53ed93d180d020fac5238cc76", "e8065d103b2bc32e33a47dd53030de2ecece693f" ], "author": { "name": "Garret Kelly", "email": "gdk@google.com", "time": "Thu May 23 08:17:53 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 23 08:17:53 2019 -0700" }, "message": "Merge remote-tracking branch \u0027goog/upstream-pixel18\u0027 into pi-dev-uaf-fix am: 1536146973\nam: e8065d103b\n\nChange-Id: I31f18a7caf251a83cd0f6de57c199e7ae32ff353\n" }, { "commit": "710d75a410f72dfbe1301d40e9c6f8e3793cf4c6", "tree": "890d952c1e1e836fabef971bf47434c7f9cde2e5", "parents": [ "2380478523514d0844c802c6c222bde608ada3b6", "e8065d103b2bc32e33a47dd53030de2ecece693f" ], "author": { "name": "Garret Kelly", "email": "gdk@google.com", "time": "Thu May 23 08:13:54 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 23 08:13:54 2019 -0700" }, "message": "Merge remote-tracking branch \u0027goog/upstream-pixel18\u0027 into pi-dev-uaf-fix am: 1536146973\nam: e8065d103b\n\nChange-Id: If467130fc02becf1923bac419c513ef21cada131\n" }, { "commit": "e8065d103b2bc32e33a47dd53030de2ecece693f", "tree": "890d952c1e1e836fabef971bf47434c7f9cde2e5", "parents": [ "5b7a6eb2833afb8d694dceb9bd17c26d7ffef60b", "15361469739d69efba81b06198c01e09581e5d4e" ], "author": { "name": "Garret Kelly", "email": "gdk@google.com", "time": "Thu May 23 07:44:37 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 23 07:44:37 2019 -0700" }, "message": "Merge remote-tracking branch \u0027goog/upstream-pixel18\u0027 into pi-dev-uaf-fix\nam: 1536146973\n\nChange-Id: I1a03abac2614c0a78fd63520bc022439c876f96e\n" }, { "commit": "15361469739d69efba81b06198c01e09581e5d4e", "tree": "8a1ea17fa37d8c492708fea944db01a56a66e692", "parents": [ "428eb3c899ddfd3f541e034d5fb16e41e7298024", "f88949e2207b65935e0c4442ea04d5a37dadb811" ], "author": { "name": "Garret Kelly", "email": "gdk@google.com", "time": "Thu May 23 08:46:31 2019 -0400" }, "committer": { "name": "Garret Kelly", "email": "gdk@google.com", "time": "Thu May 23 08:48:47 2019 -0400" }, "message": "Merge remote-tracking branch \u0027goog/upstream-pixel18\u0027 into pi-dev-uaf-fix\n\n* goog/upstream-pixel18:\n keymaster: address UAF bug in attest()\n\nBug: 133197843\nBug: 129562815\nTest: manual\nChange-Id: If990030f5cff02c241a88a51d63bc2b9dbfc365f\nSigned-off-by: Garret Kelly \u003cgdk@google.com\u003e\n" }, { "commit": "ba2a5adaf6c244aa76dae80ada2a03ae2a50ded4", "tree": "c9fd6449f48456ce51ec56bcbbebce47fe418520", "parents": [ "5b7a6eb2833afb8d694dceb9bd17c26d7ffef60b", "b3a1a394fb423aa53ed93d180d020fac5238cc76" ], "author": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Thu May 23 03:03:45 2019 +0000" }, "committer": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Thu May 23 03:03:45 2019 +0000" }, "message": "Snap for 5595178 from b3a1a394fb423aa53ed93d180d020fac5238cc76 to qt-c2f2-release\n\nChange-Id: I4bd03494827346bccf7af14199b35d5a76806ec8\n" }, { "commit": "31c2c38daf21df67421f29b699e7ce300489c8d2", "tree": "c9fd6449f48456ce51ec56bcbbebce47fe418520", "parents": [ "01e1ec489feb2febd7934173e481091eff0f8c2b", "b3a1a394fb423aa53ed93d180d020fac5238cc76" ], "author": { "name": "Garret Kelly", "email": "gdk@google.com", "time": "Wed May 22 16:48:47 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed May 22 16:48:47 2019 -0700" }, "message": "Merge remote-tracking branch \u0027goog/upstream-master\u0027 into doodle-wip9\nam: b3a1a394fb\n\nChange-Id: I464d4859503bf2d8a75e6daa53fa5559f31c6961\n" }, { "commit": "b3a1a394fb423aa53ed93d180d020fac5238cc76", "tree": "c9fd6449f48456ce51ec56bcbbebce47fe418520", "parents": [ "5b7a6eb2833afb8d694dceb9bd17c26d7ffef60b", "33b5e38acfce52b537bf82e3f5d3cadf6e627976" ], "author": { "name": "Garret Kelly", "email": "gdk@google.com", "time": "Wed May 22 14:11:57 2019 -0400" }, "committer": { "name": "Garret Kelly", "email": "gdk@google.com", "time": "Wed May 22 14:12:15 2019 -0400" }, "message": "Merge remote-tracking branch \u0027goog/upstream-master\u0027 into doodle-wip9\n\n* goog/upstream-master:\n keymaster: Fix callback invocations\n\nBug: 133143387\nTest: manual\nSigned-off-by: Garret Kelly \u003cgdk@google.com\u003e\nChange-Id: I74c5f6f44b0cb42f0b8d6e8905dc5e9358ee9201\n" }, { "commit": "33b5e38acfce52b537bf82e3f5d3cadf6e627976", "tree": "2c4ea6f287be23d742aa74c73c6956a8efc043a0", "parents": [ "53ef156e633540c9732cab949930e3c4df74eaa3" ], "author": { "name": "Garret Kelly", "email": "gdk@google.com", "time": "Tue May 21 15:18:20 2019 -0400" }, "committer": { "name": "Garret Kelly", "email": "gdk@google.com", "time": "Tue May 21 15:19:34 2019 -0400" }, "message": "keymaster: Fix callback invocations\n\nFix a pair of sites where a HIDL callback is being invoked potentially\nmore than once, or invalid data is being after an error has already been\nreported to the caller.\n\nBug: None\nTest: None\nSigned-off-by: Garret Kelly \u003cgdk@google.com\u003e\nChange-Id: Ifd8e5d8c30705485a9a1ff191a80f1ae9c2d751a\n" }, { "commit": "01e1ec489feb2febd7934173e481091eff0f8c2b", "tree": "890d952c1e1e836fabef971bf47434c7f9cde2e5", "parents": [ "4448cd5a68ab491e77dff0e83273d13b3210b2a9", "2380478523514d0844c802c6c222bde608ada3b6" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu May 16 22:41:51 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 16 22:41:51 2019 -0700" }, "message": "[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 07cc56f9cf -s ours am: fd42670d56 -s ours\nam: 2380478523\n\nChange-Id: Ia9e093bcdab2ccfdf96674caed5e4da52a1987a7\n" }, { "commit": "2380478523514d0844c802c6c222bde608ada3b6", "tree": "890d952c1e1e836fabef971bf47434c7f9cde2e5", "parents": [ "cf7f423d9dc20165b004758185dd006f2a46cb0d", "fd42670d56b52c4bc968aeefe8e6c6d1067093bb" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu May 16 21:19:41 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 16 21:19:41 2019 -0700" }, "message": "[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 07cc56f9cf -s ours\nam: fd42670d56 -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: Id84ffddaa5a455d46c1afe92face39f622377d1e\n" }, { "commit": "fd42670d56b52c4bc968aeefe8e6c6d1067093bb", "tree": "66fb10637d334d474ee7e00934add5893483734a", "parents": [ "df8ce6752aa3d53ec2ee22e40403a3ee428e5366", "07cc56f9cfd29a462b17d4d5a5ff23d52d34b5ef" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu May 16 19:14:28 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 16 19:14:28 2019 -0700" }, "message": "[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master.\nam: 07cc56f9cf -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: Ibaec09bb92f21cc9f723d45a3fa452d9276111c8\n" }, { "commit": "4448cd5a68ab491e77dff0e83273d13b3210b2a9", "tree": "890d952c1e1e836fabef971bf47434c7f9cde2e5", "parents": [ "fd4c6207db53b30cadfc6369dfac4865cda43fcd", "cf7f423d9dc20165b004758185dd006f2a46cb0d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu May 16 02:30:56 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 16 02:30:56 2019 -0700" }, "message": "[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: df8ce6752a -s ours\nam: cf7f423d9d\n\nChange-Id: I886be72a2cae988da9828d8b569c7ae5a4a2c9ed\n" }, { "commit": "cf7f423d9dc20165b004758185dd006f2a46cb0d", "tree": "890d952c1e1e836fabef971bf47434c7f9cde2e5", "parents": [ "fd4c6207db53b30cadfc6369dfac4865cda43fcd", "df8ce6752aa3d53ec2ee22e40403a3ee428e5366" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed May 15 17:28:30 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed May 15 17:28:30 2019 -0700" }, "message": "[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master\nam: df8ce6752a -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: Iea77124aeff805c0db0ab5bed2d2a31432fcbae1\n" }, { "commit": "07cc56f9cfd29a462b17d4d5a5ff23d52d34b5ef", "tree": "66fb10637d334d474ee7e00934add5893483734a", "parents": [ "2f5d9b3b21bf1e3122769e18069b93357a9208ad", "df8ce6752aa3d53ec2ee22e40403a3ee428e5366" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed May 15 16:55:33 2019 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed May 15 16:55:33 2019 -0700" }, "message": "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master.\n\nBug: 132622481\nChange-Id: I4f55f77bbb0c3ba1893b61d9dce2cf8cf8bb292d\n" }, { "commit": "df8ce6752aa3d53ec2ee22e40403a3ee428e5366", "tree": "66fb10637d334d474ee7e00934add5893483734a", "parents": [ "2f5d9b3b21bf1e3122769e18069b93357a9208ad", "6e86db1187ef21a81e64b6971f1b5bc82542dc3b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon May 13 15:39:09 2019 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon May 13 15:39:09 2019 -0700" }, "message": "DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master\n\nBug: 132622481\nChange-Id: I7b29305afaa6142a90851ca21aeb6d3771d0ad8c\n" }, { "commit": "6e86db1187ef21a81e64b6971f1b5bc82542dc3b", "tree": "441ff8eaec7b9a578b5a95e66185eb75527709df", "parents": [ "9b66f7b5eaedbbf94fa8b932eafdd380d60d0dd4", "97f37e99745f205b4bd3cece9f0470388587f14c" ], "author": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Tue May 07 21:48:00 2019 +0000" }, "committer": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Tue May 07 21:48:00 2019 +0000" }, "message": "Snap for 5450365 from 97f37e99745f205b4bd3cece9f0470388587f14c to pi-platform-release\n\nChange-Id: I9ca22748dc8f0598c4f25bd03a64a8af534c1aa4\n" }, { "commit": "fd4c6207db53b30cadfc6369dfac4865cda43fcd", "tree": "890d952c1e1e836fabef971bf47434c7f9cde2e5", "parents": [ "70116aecc16ab5d62e52befe256b4219f5e05c45", "5b7a6eb2833afb8d694dceb9bd17c26d7ffef60b" ], "author": { "name": "Garret Kelly", "email": "gdk@google.com", "time": "Wed Apr 24 09:07:36 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Apr 24 09:07:36 2019 -0700" }, "message": "Merge remote-tracking branch \u0027goog/upstream-master\u0027 into doodle_wip7\nam: 5b7a6eb283\n\nChange-Id: I5882c7cda26ba11bff3f3d61f045a003f2aa5dcd\n" }, { "commit": "5b7a6eb2833afb8d694dceb9bd17c26d7ffef60b", "tree": "890d952c1e1e836fabef971bf47434c7f9cde2e5", "parents": [ "70116aecc16ab5d62e52befe256b4219f5e05c45", "53ef156e633540c9732cab949930e3c4df74eaa3" ], "author": { "name": "Garret Kelly", "email": "gdk@google.com", "time": "Tue Apr 23 16:38:15 2019 -0400" }, "committer": { "name": "Garret Kelly", "email": "gdk@google.com", "time": "Tue Apr 23 16:59:18 2019 -0400" }, "message": "Merge remote-tracking branch \u0027goog/upstream-master\u0027 into doodle_wip7\n\n* goog/upstream-master:\n citadeld: retrieve unexpected events from Citadel\n keymaster: address UAF bug in attest()\n\nBug: 131177129\nBug: 129562815\nBug: 34946126\nBug: 62713383\nTest: manual\nChange-Id: If283dff00ec13334f8498875005ae4ccf339eae3\n" }, { "commit": "53ef156e633540c9732cab949930e3c4df74eaa3", "tree": "7f6091feb64229fc5fd1e7992b436088d1d62d03", "parents": [ "00f965be0cdfeeed441eb2a7e7166f8c1998b681" ], "author": { "name": "Bill Richardson", "email": "wfrichar@google.com", "time": "Fri Mar 22 18:08:50 2019 -0700" }, "committer": { "name": "Bill Richardson", "email": "wfrichar@google.com", "time": "Wed Apr 17 13:13:37 2019 -0700" }, "message": "citadeld: retrieve unexpected events from Citadel\n\nWhen Citadel asserts CTDL_AP_IRQ, citadeld can now query it to\nsee what events it is reporting.\n\nBug: 34946126\nBug: 62713383\nTest: manual\n\nChange-Id: I35477a22d43bc3b2017cbfaf596bdbe8676e9edf\nSigned-off-by: Bill Richardson \u003cwfrichar@google.com\u003e\n" }, { "commit": "f88949e2207b65935e0c4442ea04d5a37dadb811", "tree": "8a1ea17fa37d8c492708fea944db01a56a66e692", "parents": [ "7b1e22985ded6a0767fed36d884dd350f11e8b91" ], "author": { "name": "nagendra modadugu", "email": "ngm@google.com", "time": "Fri Apr 05 18:33:26 2019 -0700" }, "committer": { "name": "Nagendra Modadugu", "email": "ngm@google.com", "time": "Mon Apr 08 15:13:21 2019 +0000" }, "message": "keymaster: address UAF bug in attest()\n\nThis bug detected by HWSan.\n\nBug: 129562815\nTest: builds\nChange-Id: Ia9ebcd99213cd0d8d954b574b850ca563092d91b\nSigned-off-by: nagendra modadugu \u003cngm@google.com\u003e\n" }, { "commit": "00f965be0cdfeeed441eb2a7e7166f8c1998b681", "tree": "e283e175d986488d4521b937a570219ee15580d4", "parents": [ "ddf67e047a973f6f805cc25e9dc01093c422f3da" ], "author": { "name": "nagendra modadugu", "email": "ngm@google.com", "time": "Fri Apr 05 18:33:26 2019 -0700" }, "committer": { "name": "nagendra modadugu", "email": "ngm@google.com", "time": "Fri Apr 05 18:35:53 2019 -0700" }, "message": "keymaster: address UAF bug in attest()\n\nThis bug detected by HWSan.\n\nBug: 129562815\nTest: builds\nChange-Id: Ia9ebcd99213cd0d8d954b574b850ca563092d91b\nSigned-off-by: nagendra modadugu \u003cngm@google.com\u003e\n" }, { "commit": "70116aecc16ab5d62e52befe256b4219f5e05c45", "tree": "92804ec841932e86a89b94f8579c90238f3265e4", "parents": [ "2e994dbe99823947147ed9d7afffcc129d068f75", "55facbe003c840795c94ec4af98a77ce07bd8702" ], "author": { "name": "Bill Rassieur", "email": "rassb@google.com", "time": "Wed Apr 03 16:30:56 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Apr 03 16:30:56 2019 -0700" }, "message": "Merge master@5406228 into git_qt-dev-plus-aosp.\nam: 55facbe003\n\nChange-Id: I5d6a045fcea3143d3bb5cc2f26301897ab757006\n" }, { "commit": "55facbe003c840795c94ec4af98a77ce07bd8702", "tree": "8a396f8a36744da55ea044e672270917b42b5851", "parents": [ "a90cccb8ed8acb9c1fb92e2fe3627ffa12340081", "e15c796a769f6c197b76ded59c0e2bfb651c430a" ], "author": { "name": "Bill Rassieur", "email": "rassb@google.com", "time": "Fri Mar 29 04:15:43 2019 +0000" }, "committer": { "name": "Bill Rassieur", "email": "rassb@google.com", "time": "Fri Mar 29 04:15:43 2019 +0000" }, "message": "Merge master@5406228 into git_qt-dev-plus-aosp.\n\nChange-Id: I3f86757b6f51c71780f4e664e174fa5093d77fe1\nBUG: 129345239\n" }, { "commit": "2e994dbe99823947147ed9d7afffcc129d068f75", "tree": "92804ec841932e86a89b94f8579c90238f3265e4", "parents": [ "e15c796a769f6c197b76ded59c0e2bfb651c430a", "ddf67e047a973f6f805cc25e9dc01093c422f3da" ], "author": { "name": "Bill Richardson", "email": "wfrichar@google.com", "time": "Thu Mar 28 14:21:25 2019 -0700" }, "committer": { "name": "Bill Richardson", "email": "wfrichar@google.com", "time": "Thu Mar 28 14:21:25 2019 -0700" }, "message": "Merge remote-tracking branch \u0027goog/upstream-master\u0027 into doodle_wip5\n\n* goog/upstream-master:\n Convert external/nos/host/android to Android.bp\n Revert \"keymaster: include date in os_patchlevel\"\n keymaster: include date in os_patchlevel\n keymaster: consume all data passed to finish()\n keymaster: specify current time generate/import\n\nBug: 119749175\nBug: 120993832\nBug: 122184852\nTest: manual\nChange-Id: I2739598d7bf3c83cc75ba1c72ac7a15e1c5bf7b9\n" }, { "commit": "ddf67e047a973f6f805cc25e9dc01093c422f3da", "tree": "2206682df382d77bc850869ece27df2bd3a39cfe", "parents": [ "5c9d2ef7b0193ba361a8acc0ce58c1423b4eee9b" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Mar 22 15:26:05 2019 -0700" }, "committer": { "name": "Bill Richardson", "email": "wfrichar@google.com", "time": "Wed Mar 27 10:48:52 2019 -0700" }, "message": "Convert external/nos/host/android to Android.bp\n\nSee build/soong/README.md for more information.\n\nFixes: 122332121\nTest: mma\nChange-Id: Iaa53f270e8c19bf1dcbf7c4ddf1862cd0cc947d3\n(cherry picked from commit 278f038f4ca06af71ff15e71ab75ff719264d510)\n" }, { "commit": "5c9d2ef7b0193ba361a8acc0ce58c1423b4eee9b", "tree": "867661c91afec9f6fd55ef576e383a81c61f8b4c", "parents": [ "e511a9c6e5faad152754e7dbe21d5859d124004f" ], "author": { "name": "nagendra modadugu", "email": "ngm@google.com", "time": "Thu Feb 07 23:18:44 2019 -0800" }, "committer": { "name": "nagendra modadugu", "email": "ngm@google.com", "time": "Mon Mar 25 21:50:10 2019 -0700" }, "message": "Revert \"keymaster: include date in os_patchlevel\"\n\nTurns out that the bug was in nugget, with firmware\nusing SYSTEM_PATCH_LEVEL in place of BOOT_PATCH_LEVEL.\n\nThis reverts commit 5eb6baddb394ae11a5947867058be2923497babd.\nThe original commit message is below.\n\n keymaster: include date in os_patchlevel\n\n The date field was mysteriously missing\n from the originally patchset. Further\n attendance has addressed the issue.\n\nBug: 119549128\nTest: attest cert format is as expected \u0026 VTS pass\nChange-Id: I99da4db36489d356c897c3d77223b9bf174dee29\nSigned-off-by: nagendra modadugu \u003cngm@google.com\u003e\n(cherry picked from commit 7b1e22985ded6a0767fed36d884dd350f11e8b91)\n" }, { "commit": "e511a9c6e5faad152754e7dbe21d5859d124004f", "tree": "cd45940b345a8b4a7d728f0471555769f7ea6ea4", "parents": [ "f29bb53671e5aa9f88f84cd38dc1d2fd6e390c80" ], "author": { "name": "nagendra modadugu", "email": "ngm@google.com", "time": "Wed Feb 06 10:36:29 2019 -0800" }, "committer": { "name": "nagendra modadugu", "email": "ngm@google.com", "time": "Mon Mar 25 21:49:40 2019 -0700" }, "message": "keymaster: include date in os_patchlevel\n\nThe date field was mysteriously missing\nfrom the originally patchset. Further\nattendance has addressed the issue.\n\nBug: 119549128\nTest: attest cert format is as expected\nChange-Id: I2a8b055a6ad2b7d6b26fcdd65b9c2140a866d17c\nSigned-off-by: nagendra modadugu \u003cngm@google.com\u003e\n(cherry picked from commit 5eb6baddb394ae11a5947867058be2923497babd)\n" }, { "commit": "f29bb53671e5aa9f88f84cd38dc1d2fd6e390c80", "tree": "867661c91afec9f6fd55ef576e383a81c61f8b4c", "parents": [ "f12b8952b392b241774d0c72c39f32d8682460e6" ], "author": { "name": "nagendra modadugu", "email": "ngm@google.com", "time": "Tue Feb 05 21:37:05 2019 -0800" }, "committer": { "name": "nagendra modadugu", "email": "ngm@google.com", "time": "Mon Mar 25 21:49:31 2019 -0700" }, "message": "keymaster: consume all data passed to finish()\n\nIn the previous implementation, it was possible\nfor excess data to remain unprocessed once\nthe finish() call had completed. This issue\nwent unnoticed until a recent VTS change.\n\nBug: 120993832\nBug: 119749175\nTest: VTS passes\nChange-Id: Id01710e4ed01e5899dff35e0fa6100882906b336\nSigned-off-by: nagendra modadugu \u003cngm@google.com\u003e\n(cherry picked from commit f0afd5b56f5dd918a05b80d86d2b772048868816)\n" }, { "commit": "f12b8952b392b241774d0c72c39f32d8682460e6", "tree": "bb936bed7c1864b3466961bc83aa856c8799d2ca", "parents": [ "722e719c4450b9ebd737088de51ca4552fc2934c" ], "author": { "name": "nagendra modadugu", "email": "ngm@google.com", "time": "Wed Jan 02 11:57:35 2019 -0800" }, "committer": { "name": "nagendra modadugu", "email": "ngm@google.com", "time": "Mon Mar 25 21:10:28 2019 -0700" }, "message": "keymaster: specify current time generate/import\n\nWhen generating or importing keys, specify the\ncurrent time which gets included in the corresponding\nblob.\n\nBug: 122184852\nTest: pending\nChange-Id: I3a19ac67054473084a7268926c7136667621f1e7\n(cherry picked from commit 0e23f8d91cc2d7bbe95d815d0a1f1698909ac2f6)\n" }, { "commit": "e15c796a769f6c197b76ded59c0e2bfb651c430a", "tree": "8a396f8a36744da55ea044e672270917b42b5851", "parents": [ "374234b49de66deeffebffbcfffc2f3188e1f679", "409907cf242f9b7e41f9a8a8b088cfbb75b4cfda" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Mar 22 20:41:31 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Mar 22 20:41:31 2019 -0700" }, "message": "Convert external/nos/host/android to Android.bp am: 278f038f4c am: 2f5d9b3b21\nam: 409907cf24\n\nChange-Id: Idb8f5f7f69f0998d8d9c44bc305384170d8874b0\n" }, { "commit": "374234b49de66deeffebffbcfffc2f3188e1f679", "tree": "18cc1b035ef2fe029181fcf28ed1bc80f4290fcf", "parents": [ "fcafcd1b444a9c131c56cc61e53bc6044750f289", "25d43a4f780f056eb07e01671684229dfa26d7d2" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Mar 22 20:41:22 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Mar 22 20:41:22 2019 -0700" }, "message": "Remove unused conditional am: 9ed8822c21 am: f31fba2259\nam: 25d43a4f78\n\nChange-Id: I4b0b8c8b6d5e824ed3007622eb1bb28361131d62\n" }, { "commit": "409907cf242f9b7e41f9a8a8b088cfbb75b4cfda", "tree": "66fb10637d334d474ee7e00934add5893483734a", "parents": [ "25d43a4f780f056eb07e01671684229dfa26d7d2", "2f5d9b3b21bf1e3122769e18069b93357a9208ad" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Mar 22 20:37:30 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Mar 22 20:37:30 2019 -0700" }, "message": "Convert external/nos/host/android to Android.bp am: 278f038f4c\nam: 2f5d9b3b21\n\nChange-Id: Ic7814ebbaa6d9868f16bb9ed9104c4a0437c974b\n" }, { "commit": "25d43a4f780f056eb07e01671684229dfa26d7d2", "tree": "cc2c6e4febbde045485416ecfe3bde551505ec85", "parents": [ "e4aa6d24b157a53202093fc4fe79bd01fe8ab6d5", "f31fba2259ed31b9f702968af3308c7ff95b5501" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Mar 22 20:37:21 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Mar 22 20:37:21 2019 -0700" }, "message": "Remove unused conditional am: 9ed8822c21\nam: f31fba2259\n\nChange-Id: I8f323910f61437eaff93cced02760089365c88a5\n" }, { "commit": "2f5d9b3b21bf1e3122769e18069b93357a9208ad", "tree": "61868bc8b589f67224a44a0c7375d0679402819e", "parents": [ "f31fba2259ed31b9f702968af3308c7ff95b5501", "278f038f4ca06af71ff15e71ab75ff719264d510" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Mar 22 20:33:27 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Mar 22 20:33:27 2019 -0700" }, "message": "Convert external/nos/host/android to Android.bp\nam: 278f038f4c\n\nChange-Id: I2416fe23e3f5f00df5f400d05bc7803d90b3d012\n" }, { "commit": "f31fba2259ed31b9f702968af3308c7ff95b5501", "tree": "80ada98f8f80b8b540b16f8f5be871a967908cf7", "parents": [ "5c5ffdbf26e90b7cb8b93375053fc5f3344ededd", "9ed8822c2186e40ce2831b8279e17398c05f0c76" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Mar 22 20:33:21 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Mar 22 20:33:21 2019 -0700" }, "message": "Remove unused conditional\nam: 9ed8822c21\n\nChange-Id: Ib704330b467ee0574a4c2308cf3f421f0aebf642\n" }, { "commit": "278f038f4ca06af71ff15e71ab75ff719264d510", "tree": "61868bc8b589f67224a44a0c7375d0679402819e", "parents": [ "9ed8822c2186e40ce2831b8279e17398c05f0c76" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Mar 22 15:26:05 2019 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Mar 22 15:26:05 2019 -0700" }, "message": "Convert external/nos/host/android to Android.bp\n\nSee build/soong/README.md for more information.\n\nFixes: 122332121\nTest: mma\nChange-Id: Iaa53f270e8c19bf1dcbf7c4ddf1862cd0cc947d3\n" }, { "commit": "9ed8822c2186e40ce2831b8279e17398c05f0c76", "tree": "80ada98f8f80b8b540b16f8f5be871a967908cf7", "parents": [ "cda8f6d00171e1be8f9ce0a9902dad445670db20" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Mar 22 14:01:35 2019 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Mar 22 14:01:35 2019 -0700" }, "message": "Remove unused conditional\n\nENABLE_QCOM_OTF_PROVISIONING is unused after\nI9a12b02812db6aa7775893e94254c55016a28fa1, remove the conditional\nthat sets it.\n\nBug: 122332121\nTest: mma\nChange-Id: Ic06e24d8106a0705d4523a2da48700d6c955aa63\n" }, { "commit": "fcafcd1b444a9c131c56cc61e53bc6044750f289", "tree": "e9c181a5b007ead175fabd1939c33413d4a82b7b", "parents": [ "a90cccb8ed8acb9c1fb92e2fe3627ffa12340081", "722e719c4450b9ebd737088de51ca4552fc2934c" ], "author": { "name": "Bill Richardson", "email": "wfrichar@google.com", "time": "Thu Mar 21 17:35:55 2019 -0700" }, "committer": { "name": "Bill Richardson", "email": "wfrichar@google.com", "time": "Thu Mar 21 17:43:36 2019 -0700" }, "message": "Merge remote-tracking branch \u0027goog/upstream-master\u0027 into fixy-fix\n\n* goog/upstream-master:\n citadeld: Fix deadlock due to missing unique_lock scope\n\nBug: 128522246\nTest: manual\n\nChange-Id: I03aaaa621d08eb4b958ddddf0e675213c25fc17f\nSigned-off-by: Bill Richardson \u003cwfrichar@google.com\u003e\n" }, { "commit": "722e719c4450b9ebd737088de51ca4552fc2934c", "tree": "f700d75f02379bce4c10fdad844b11170efda44f", "parents": [ "4927a64db02fabf52635bf7ec4e019bce17b076f" ], "author": { "name": "Bill Richardson", "email": "wfrichar@google.com", "time": "Thu Mar 21 15:46:51 2019 -0700" }, "committer": { "name": "Bill Richardson", "email": "wfrichar@google.com", "time": "Thu Mar 21 16:40:00 2019 -0700" }, "message": "citadeld: Fix deadlock due to missing unique_lock scope\n\nIn CitadelProxy::callApp(), we need to release the app-specific\nlock before we invoke _stats_collection.schedule(). Otherwise,\nthe deferred callback may also try to grab that lock, causing deadlock:\n\n callApp: hold _appLocks[], call schedule() \u003d\u003e block on _cv_mutex\n deferred: hold _cv_mutex, call cacheStats() \u003d\u003e block on _appLocks[]\n\nMany thanks to ascull@ for figuring this out.\n\nBug: 128522246\nTest: By inspection, because I couldn\u0027t reproduce the bug myself\n\nChange-Id: I301605a5d2b078e2a7389a58d345e33cb081f5bf\nSigned-off-by: Bill Richardson \u003cwfrichar@google.com\u003e\n" }, { "commit": "a90cccb8ed8acb9c1fb92e2fe3627ffa12340081", "tree": "dac50ed8dd7f2976967e395cbe62d6e604b9ec7b", "parents": [ "d1daae4510fe8c952fa4c983d4acaf89848c8e44", "4927a64db02fabf52635bf7ec4e019bce17b076f" ], "author": { "name": "Bill Richardson", "email": "wfrichar@google.com", "time": "Mon Mar 11 14:34:31 2019 -0700" }, "committer": { "name": "Bill Richardson", "email": "wfrichar@google.com", "time": "Mon Mar 11 14:34:31 2019 -0700" }, "message": "Merge remote-tracking branch \u0027goog/upstream-master\u0027 into last_reset\n\n* goog/upstream-master:\n Rename Citadel\u0027s \"Reset\" power state to \"Last-Reset\"\n\nChange-Id: I86d02dc73d9db617f0b45853d969974be4d5719b\n" }, { "commit": "4927a64db02fabf52635bf7ec4e019bce17b076f", "tree": "6f005b62b6986b522c2e2d2e6c0ee1c4562e06e0", "parents": [ "b5e3b53dd266cfff594932ee57a1b68f99d8c030" ], "author": { "name": "Bill Richardson", "email": "wfrichar@google.com", "time": "Fri Mar 08 14:40:54 2019 -0800" }, "committer": { "name": "Bill Richardson", "email": "wfrichar@google.com", "time": "Fri Mar 08 14:40:54 2019 -0800" }, "message": "Rename Citadel\u0027s \"Reset\" power state to \"Last-Reset\"\n\nThe \"Reset\" name is a bit confusing since it\u0027s not actually a\nstate, merely a transition. But we use this state to display the\nnumber of resets and the current uptime.\n\nBug: 70510004\nTest: Manual\n\nChange-Id: I186c147a5ab25bcda9b8cddcd4990afa47a01a31\nSigned-off-by: Bill Richardson \u003cwfrichar@google.com\u003e\n" }, { "commit": "d1daae4510fe8c952fa4c983d4acaf89848c8e44", "tree": "802be90ab4fc2ade22b49c74127170b7c626c605", "parents": [ "18e6bd786dcd1ef8796bee3dc786f3f74d2e8646", "17d3407ed21af615f5be449d9ebd1be27add5a57" ], "author": { "name": "Bill Richardson", "email": "wfrichar@google.com", "time": "Thu Mar 07 23:10:38 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Mar 07 23:10:38 2019 +0000" }, "message": "Merge \"Merge remote-tracking branch \u0027goog/upstream-master\u0027 into bill-release\"" }, { "commit": "18e6bd786dcd1ef8796bee3dc786f3f74d2e8646", "tree": "f8502de0ba9d985a1b2094ee83f544f4507a7e76", "parents": [ "20304587068892e4d0d57e89aa0df9025b091470" ], "author": { "name": "Bill Richardson", "email": "wfrichar@google.com", "time": "Thu Mar 07 11:05:15 2019 -0800" }, "committer": { "name": "Bill Richardson", "email": "wfrichar@google.com", "time": "Thu Mar 07 11:05:15 2019 -0800" }, "message": "Add wfrichar to OWNERS\n\n $ git log --format\u003d\u0027%ae\u0027 | sort | uniq -c | sort -n -r\n 53 ascull@google.com\n 49 ngm@google.com\n \u003d\u003d\u003e 32 wfrichar@google.com \u003c\u003d\u003d\n 15 allenwebb@google.com\n 11 jdanis@google.com\n 2 gdk@google.com\n 1 wesson@google.com\n $\n\nBug: none\nTest: none\n\nChange-Id: I61a43a799cc8c4563d0e58be19a6e760d2cbc5f1\nSigned-off-by: Bill Richardson \u003cwfrichar@google.com\u003e\n" }, { "commit": "17d3407ed21af615f5be449d9ebd1be27add5a57", "tree": "4de536660d55d6060f61cd0cebf18c554f492ea9", "parents": [ "20304587068892e4d0d57e89aa0df9025b091470", "b5e3b53dd266cfff594932ee57a1b68f99d8c030" ], "author": { "name": "Bill Richardson", "email": "wfrichar@google.com", "time": "Wed Mar 06 11:49:44 2019 -0800" }, "committer": { "name": "Bill Richardson", "email": "wfrichar@google.com", "time": "Wed Mar 06 11:49:44 2019 -0800" }, "message": "Merge remote-tracking branch \u0027goog/upstream-master\u0027 into bill-release\n\n* goog/upstream-master:\n Register citadeld with the power.stats service\n citadeld: export cached stats via AIDL\n citadeld: request and cache low-power stats\n\nChange-Id: I44f8f436ef1b2d08873766a0210baf8cd1d92a7c\n" }, { "commit": "b5e3b53dd266cfff594932ee57a1b68f99d8c030", "tree": "eafbbc5aa9c808ed7223c865e656e622f309f157", "parents": [ "6a07027faa2a404c773a2f065aa77e0a669ceefd" ], "author": { "name": "Bill Richardson", "email": "wfrichar@google.com", "time": "Wed Feb 20 19:48:58 2019 -0800" }, "committer": { "name": "Bill Richardson", "email": "wfrichar@google.com", "time": "Thu Feb 28 17:09:05 2019 -0800" }, "message": "Register citadeld with the power.stats service\n\nThis allows the power.stats service to retrieve citadeld\u0027s cached\nstats information from time to time.\n\nBoth citadeld and power.stats are services, but AIDL prefers to\nhave services talk to clients and vice-versa.\n\nThis CL adds a new StatsDelegate class to provide the client-like\ninterface that power.stats requires, and instantiates it in a\nbackground thread so that citadeld won\u0027t block if the power.stats\nservice is not available.\n\nBug: 70510004\nTest: manual\n\nThese commands are handy for testing all the possible\ncombinations of events:\n\n logcat | egrep -i \u0027citadel|power\u0027\n\n /vendor/bin/hw/citadel_updater -lv\n lshal debug android.hardware.power.stats@1.0::IPowerStats/default\n\n killall android.hardware.power.stats@1.0-service.pixel\n killall citadeld\n\n setprop ctl.stop vendor.power.stats-hal-1-0\n setprop ctl.start vendor.power.stats-hal-1-0\n\n setprop ctl.stop vendor.citadeld\n setprop ctl.start vendor.citadeld\n\nChange-Id: I207ea4773faf9856bc7e39da8b4168002f23174e\nSigned-off-by: Bill Richardson \u003cwfrichar@google.com\u003e\n" }, { "commit": "6a07027faa2a404c773a2f065aa77e0a669ceefd", "tree": "39f0658c6fa716bc01629865481ae486dbb2edb2", "parents": [ "fbb3011a5dbab73aed73536e024cb68726b8d2a8" ], "author": { "name": "Bill Richardson", "email": "wfrichar@google.com", "time": "Thu Feb 07 12:02:12 2019 -0800" }, "committer": { "name": "Bill Richardson", "email": "wfrichar@google.com", "time": "Thu Feb 28 08:57:32 2019 -0800" }, "message": "citadeld: export cached stats via AIDL\n\nThis adds a getCachedStats() method to ICitadeld.aidl and an\nimplementation to citadeld, so that citadel_updater can check its\ncached copy of Citadel\u0027s low-power stats.\n\nBug: 123950560\nTest: manual\n\nChange-Id: If8e5071d50f22528d2c48de1ddbf81892ad4e787\nSigned-off-by: Bill Richardson \u003cwfrichar@google.com\u003e\n" }, { "commit": "fbb3011a5dbab73aed73536e024cb68726b8d2a8", "tree": "c3e3ecfd44169e06e0e060baf5323d3c51e446fe", "parents": [ "01337ceea2608aafe56294b106b548d1a469e80b" ], "author": { "name": "Bill Richardson", "email": "wfrichar@google.com", "time": "Thu Feb 07 10:32:01 2019 -0800" }, "committer": { "name": "Bill Richardson", "email": "wfrichar@google.com", "time": "Wed Feb 27 15:28:47 2019 -0800" }, "message": "citadeld: request and cache low-power stats\n\nThis requests the low-power stats from Citadel, following each\nburst of AP-to-Citadel traffic. The stats are merely cached for\nnow. A future CLs will make use of them.\n\nBug: 123950560\nTest: manual\n\n Watched Citadel console to observe request appear (once), only\n after 0.5 seconds have elapsed since the last SPI transaction.\n\nChange-Id: Ifd72a6ce9724c0db901356c3ec01254b54cec9c6\nSigned-off-by: Bill Richardson \u003cwfrichar@google.com\u003e\n" }, { "commit": "97f37e99745f205b4bd3cece9f0470388587f14c", "tree": "441ff8eaec7b9a578b5a95e66185eb75527709df", "parents": [ "85ea1402af5d3aaa0f85a4aff17247814c3dc2f3", "428eb3c899ddfd3f541e034d5fb16e41e7298024" ], "author": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Wed Feb 27 04:05:52 2019 +0000" }, "committer": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Wed Feb 27 04:05:52 2019 +0000" }, "message": "Snap for 5339334 from 428eb3c899ddfd3f541e034d5fb16e41e7298024 to pi-qpr3-release\n\nChange-Id: Ibdd4ed1886396d3f1b67737f6dfa86c7a3559ee2\n" }, { "commit": "44ee17aff7ccec2776ec358d570b3df9473627a5", "tree": "441ff8eaec7b9a578b5a95e66185eb75527709df", "parents": [ "85ea1402af5d3aaa0f85a4aff17247814c3dc2f3", "428eb3c899ddfd3f541e034d5fb16e41e7298024" ], "author": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Tue Feb 26 06:11:56 2019 +0000" }, "committer": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Tue Feb 26 06:11:56 2019 +0000" }, "message": "Snap for 5335558 from 428eb3c899ddfd3f541e034d5fb16e41e7298024 to pi-qpr3-b-release\n\nChange-Id: Ief44a953e8347776ae66fc0b910b15d90aaf0dec\n" }, { "commit": "20304587068892e4d0d57e89aa0df9025b091470", "tree": "88c39a2ca24b9cc8d5a0ff08860bf66d91d0875c", "parents": [ "9dae8fd33f61ec86d77834eec766a1ccba3cf47a", "e4aa6d24b157a53202093fc4fe79bd01fe8ab6d5" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Feb 25 08:14:05 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Feb 25 08:14:05 2019 -0800" }, "message": "[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: 5c5ffdbf26 -s ours\nam: e4aa6d24b1 -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: I94e88cfefdbcccca3eaca32273ae135559776a06\n" }, { "commit": "e4aa6d24b157a53202093fc4fe79bd01fe8ab6d5", "tree": "392680c062ea28b8249652beaa7e0f095336f22d", "parents": [ "1a5aa6d21cfc4618b9f03412479487f7c514417d", "5c5ffdbf26e90b7cb8b93375053fc5f3344ededd" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Feb 25 06:14:14 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Feb 25 06:14:14 2019 -0800" }, "message": "[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master\nam: 5c5ffdbf26 -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: I0cb2ef4e516e83b86db0066b0be2b42808cca626\n" }, { "commit": "9dae8fd33f61ec86d77834eec766a1ccba3cf47a", "tree": "88c39a2ca24b9cc8d5a0ff08860bf66d91d0875c", "parents": [ "1d4d566fbfdb7314703d90cfd87aa3bebd9d21d6", "1a5aa6d21cfc4618b9f03412479487f7c514417d" ], "author": { "name": "nagendra modadugu", "email": "ngm@google.com", "time": "Fri Feb 22 17:46:08 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Feb 22 17:46:08 2019 -0800" }, "message": "[automerger skipped] [DO NOT MERGE] Merge remote-tracking branch \u0027goog/upstream-pixel18\u0027 into ngm-ota-rc11 am: 428eb3c899\nam: 1a5aa6d21c -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: Ic57a5b381c47452e2e8b86a15b16cf19ff729cd7\n" }, { "commit": "1a5aa6d21cfc4618b9f03412479487f7c514417d", "tree": "392680c062ea28b8249652beaa7e0f095336f22d", "parents": [ "703b105df386fed3622aa8be6691972c9619d880", "428eb3c899ddfd3f541e034d5fb16e41e7298024" ], "author": { "name": "nagendra modadugu", "email": "ngm@google.com", "time": "Fri Feb 22 17:25:59 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Feb 22 17:25:59 2019 -0800" }, "message": "[DO NOT MERGE] Merge remote-tracking branch \u0027goog/upstream-pixel18\u0027 into ngm-ota-rc11\nam: 428eb3c899\n\nChange-Id: I51e9194dde717be525fb43317aa6060a6ee84bfb\n" }, { "commit": "428eb3c899ddfd3f541e034d5fb16e41e7298024", "tree": "441ff8eaec7b9a578b5a95e66185eb75527709df", "parents": [ "85ea1402af5d3aaa0f85a4aff17247814c3dc2f3", "7b1e22985ded6a0767fed36d884dd350f11e8b91" ], "author": { "name": "nagendra modadugu", "email": "ngm@google.com", "time": "Thu Feb 07 23:48:31 2019 -0800" }, "committer": { "name": "nagendra modadugu", "email": "ngm@google.com", "time": "Fri Feb 22 10:29:53 2019 -0800" }, "message": "[DO NOT MERGE] Merge remote-tracking branch \u0027goog/upstream-pixel18\u0027 into ngm-ota-rc11\n\n* goog/upstream-pixel18:\n Revert \"keymaster: include date in os_patchlevel\"\n keymaster: include date in os_patchlevel\n keymaster: consume all data passed to finish()\n keymaster: specify current time generate/import\n\nBug: 122375834\nBug: 119541233\nTest: pending\nChange-Id: If599d63a287e9db5ec61f3cac08ace3bf1e56cde\n" }, { "commit": "5c5ffdbf26e90b7cb8b93375053fc5f3344ededd", "tree": "5b45a9fc1706f6ce170f2723122821c6da4c76ef", "parents": [ "c805f29bb3c6534d7fe0eed491347e9c1b096868", "01151496d9d5230e2ba69b166c3fde46b06cdb0f" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Feb 20 16:18:48 2019 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Feb 20 16:18:48 2019 -0800" }, "message": "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master\n\nBug: 120848293\nChange-Id: Id21c3fce816e87bf565d9b935355f12708dd9a57\n" }, { "commit": "1d4d566fbfdb7314703d90cfd87aa3bebd9d21d6", "tree": "88c39a2ca24b9cc8d5a0ff08860bf66d91d0875c", "parents": [ "26525fdf6bfcb16501403f8407568da4739b0d8f", "703b105df386fed3622aa8be6691972c9619d880" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Feb 20 10:10:12 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Feb 20 10:10:12 2019 -0800" }, "message": "[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: cda8f6d001 -s ours am: c805f29bb3 -s ours\nam: 703b105df3 -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: Ia182ad0bcde8b11eaf5c6218987fe22ad1f81e50\n" }, { "commit": "703b105df386fed3622aa8be6691972c9619d880", "tree": "5b45a9fc1706f6ce170f2723122821c6da4c76ef", "parents": [ "59cb5b88e78565d12df8e56be529c754d9c4f296", "c805f29bb3c6534d7fe0eed491347e9c1b096868" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Feb 20 09:18:47 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Feb 20 09:18:47 2019 -0800" }, "message": "[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: cda8f6d001 -s ours\nam: c805f29bb3 -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: I5e7ef640405994de34f8d6829c7045b0211a53de\n" }, { "commit": "c805f29bb3c6534d7fe0eed491347e9c1b096868", "tree": "5b45a9fc1706f6ce170f2723122821c6da4c76ef", "parents": [ "5c3ba98482a273ea616bf334a645a589b95f12bc", "cda8f6d00171e1be8f9ce0a9902dad445670db20" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Feb 20 08:40:54 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Feb 20 08:40:54 2019 -0800" }, "message": "[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master\nam: cda8f6d001 -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: I23a5e3c31dea13e482aad2d233151816c02c60dc\n" }, { "commit": "cda8f6d00171e1be8f9ce0a9902dad445670db20", "tree": "5b45a9fc1706f6ce170f2723122821c6da4c76ef", "parents": [ "88accc46d9e2d285e8a3c7543d8e26474155949c", "5c3ba98482a273ea616bf334a645a589b95f12bc" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Feb 18 15:58:25 2019 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Feb 18 15:58:25 2019 -0800" }, "message": "DO NOT MERGE - Merge PPRL.190205.001 into master\n\nBug: 124234733\nChange-Id: I4880defc417654aea324ebbf4399784476cb5900\n" }, { "commit": "26525fdf6bfcb16501403f8407568da4739b0d8f", "tree": "88c39a2ca24b9cc8d5a0ff08860bf66d91d0875c", "parents": [ "2f6fdea2f6b46010c95a85da95e4e586a6f40f96", "59cb5b88e78565d12df8e56be529c754d9c4f296" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Feb 14 20:58:40 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Feb 14 20:58:40 2019 -0800" }, "message": "[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master am: 5c3ba98482 -s ours\nam: 59cb5b88e7 -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: I5c1dd04156b2b034359f157e65d56c80c944effc\n" }, { "commit": "59cb5b88e78565d12df8e56be529c754d9c4f296", "tree": "5b45a9fc1706f6ce170f2723122821c6da4c76ef", "parents": [ "01151496d9d5230e2ba69b166c3fde46b06cdb0f", "5c3ba98482a273ea616bf334a645a589b95f12bc" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Feb 14 14:29:24 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Feb 14 14:29:24 2019 -0800" }, "message": "[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master\nam: 5c3ba98482 -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: I73f13c551079a10ec92021a7828762f371a0eff5\n" }, { "commit": "5c3ba98482a273ea616bf334a645a589b95f12bc", "tree": "5b45a9fc1706f6ce170f2723122821c6da4c76ef", "parents": [ "ebbc48a3a9ae6357ada25ec7c57849c189adebad", "9b66f7b5eaedbbf94fa8b932eafdd380d60d0dd4" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Feb 12 09:53:36 2019 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Feb 12 09:53:36 2019 -0800" }, "message": "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master\n\nBug: 124234733\nChange-Id: I5e2f327fdc1b593142c2e43ffc976eff09e198f8\n" }, { "commit": "9b66f7b5eaedbbf94fa8b932eafdd380d60d0dd4", "tree": "7a3eab8897c5e31f5dc0e50dde60f0a2ecee383b", "parents": [ "336cf03c904928d0f213e99fecf913abbf043f5e", "5143b9a1361c5aa72e60eb68375cb3af598190c5" ], "author": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Sat Feb 09 02:17:34 2019 +0000" }, "committer": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Sat Feb 09 02:17:34 2019 +0000" }, "message": "Snap for 5180536 from 5143b9a1361c5aa72e60eb68375cb3af598190c5 to pi-platform-release\n\nChange-Id: I5865a1f1e4993a71e6d4cd507426e62dfbeb1720\n" } ], "next": "7b1e22985ded6a0767fed36d884dd350f11e8b91" }