)]}' { "log": [ { "commit": "9eda958cd3fe9284e48995525ee050363699abb6", "tree": "b3b50938bdbaf0ba06a3fbe149342701bfa545a0", "parents": [ "e13194474f9b0035ae014b3193027641ae2d48fb", "33bed53c03c2ad187f8a51af658f1085706f323b" ], "author": { "name": "Sadaf Ebrahimi", "email": "sadafebrahimi@google.com", "time": "Thu Dec 19 11:44:14 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 19 11:44:14 2024 -0800" }, "message": "Add janitors to the OWNERS file am: 33bed53c03\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/3423566\n\nChange-Id: Ia75d16fccc4ce91315efd8cfb25ba2a8e77a32de\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "33bed53c03c2ad187f8a51af658f1085706f323b", "tree": "b3b50938bdbaf0ba06a3fbe149342701bfa545a0", "parents": [ "e13194474f9b0035ae014b3193027641ae2d48fb" ], "author": { "name": "Sadaf Ebrahimi", "email": "sadafebrahimi@google.com", "time": "Wed Dec 18 20:07:13 2024 +0000" }, "committer": { "name": "Sadaf Ebrahimi", "email": "sadafebrahimi@google.com", "time": "Wed Dec 18 20:07:13 2024 +0000" }, "message": "Add janitors to the OWNERS file\n\nTest: TreeHugger\nChange-Id: I8bd33d5b06be14af9b56b3647a0b0fc251b6f818\n" }, { "commit": "e13194474f9b0035ae014b3193027641ae2d48fb", "tree": "fc404ed8c935947487ed31a864d9b668f5c9c051", "parents": [ "5e8223649339798d6df7260b34f973b924dd1418", "9d05aae80c5858fe54be72e57aaf2d6c76f1a271" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Tue Oct 03 07:57:12 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 03 07:57:12 2023 +0000" }, "message": "Use Gson built from source. am: 7ddb89d3d8 am: a7762b08e3 am: 5f3d39619e am: 401c98c20a am: 9d05aae80c\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/2770178\n\nChange-Id: Ie8b20b122cbd7c9efd42bcc5bc472a6575ec638b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9d05aae80c5858fe54be72e57aaf2d6c76f1a271", "tree": "fc404ed8c935947487ed31a864d9b668f5c9c051", "parents": [ "5e8223649339798d6df7260b34f973b924dd1418", "401c98c20adc8b03653c56aef77f23d95f81d04a" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Tue Oct 03 07:28:26 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 03 07:28:26 2023 +0000" }, "message": "Use Gson built from source. am: 7ddb89d3d8 am: a7762b08e3 am: 5f3d39619e am: 401c98c20a\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/2770178\n\nChange-Id: I6da9f199c7fbb2568553da96e220a51948901e88\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "401c98c20adc8b03653c56aef77f23d95f81d04a", "tree": "fc404ed8c935947487ed31a864d9b668f5c9c051", "parents": [ "5e8223649339798d6df7260b34f973b924dd1418", "5f3d39619ec565f862f3d5aa072fb07448c6a0a8" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Tue Oct 03 06:41:31 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 03 06:41:31 2023 +0000" }, "message": "Use Gson built from source. am: 7ddb89d3d8 am: a7762b08e3 am: 5f3d39619e\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/2770178\n\nChange-Id: Ife627ba77b50fe35a758aeeda2dcdc6fb74b0f2c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5f3d39619ec565f862f3d5aa072fb07448c6a0a8", "tree": "fc404ed8c935947487ed31a864d9b668f5c9c051", "parents": [ "5e8223649339798d6df7260b34f973b924dd1418", "a7762b08e3a3229e2e8b2b64ed21b8f32c2befb7" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Tue Oct 03 06:10:23 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 03 06:10:23 2023 +0000" }, "message": "Use Gson built from source. am: 7ddb89d3d8 am: a7762b08e3\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/2770178\n\nChange-Id: I8f63e0da41ee46f91d5ee1e3ebc9686afe6704de\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a7762b08e3a3229e2e8b2b64ed21b8f32c2befb7", "tree": "fc404ed8c935947487ed31a864d9b668f5c9c051", "parents": [ "5e8223649339798d6df7260b34f973b924dd1418", "7ddb89d3d873da009d3fb3fcfbb6fa67ea664628" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Tue Oct 03 05:39:58 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 03 05:39:58 2023 +0000" }, "message": "Use Gson built from source. am: 7ddb89d3d8\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/2770178\n\nChange-Id: Icb663063c1bbe2205471df8d8ba6fe0e0575918d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7ddb89d3d873da009d3fb3fcfbb6fa67ea664628", "tree": "fc404ed8c935947487ed31a864d9b668f5c9c051", "parents": [ "d1b4944e6a8aaf43c7f3eb8054e77d3fab1b2fe1" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Sat Sep 30 00:16:18 2023 +0000" }, "committer": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Sat Sep 30 00:16:18 2023 +0000" }, "message": "Use Gson built from source.\n\nDeletes the prebuilt, which is also used from external/vogar\n(see the other CL in this topic).\n\nBug: 243950468\nTest: presubmit\nChange-Id: I4d6507c0e38dbf3ff7151f7ca1e0ff80019b5afd\n" }, { "commit": "5e8223649339798d6df7260b34f973b924dd1418", "tree": "4ab55381144af0b3d9e2889a9cb802734356598f", "parents": [ "49a812825bad5eb3f13ce65d80c43e18b4db9a3a", "d1b4944e6a8aaf43c7f3eb8054e77d3fab1b2fe1" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Wed Oct 26 21:14:42 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 26 21:14:42 2022 +0000" }, "message": "Fix errorprone warnings that should be errors am: 40710ba037 am: a913564d21 am: d1b4944e6a\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/2255923\n\nChange-Id: I63ff965b551e1e4939c7ea16b52930f1758dd8ad\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d1b4944e6a8aaf43c7f3eb8054e77d3fab1b2fe1", "tree": "4ab55381144af0b3d9e2889a9cb802734356598f", "parents": [ "0974b1a712c1688964c707f968a123be344bae9c", "a913564d21c9907317a0aea315041cf5be84131e" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Wed Oct 26 20:18:50 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 26 20:18:50 2022 +0000" }, "message": "Fix errorprone warnings that should be errors am: 40710ba037 am: a913564d21\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/2255923\n\nChange-Id: Ifcb77367b6237bb923c24f38341a0f0065d19c61\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a913564d21c9907317a0aea315041cf5be84131e", "tree": "4ab55381144af0b3d9e2889a9cb802734356598f", "parents": [ "0974b1a712c1688964c707f968a123be344bae9c", "40710ba03774aeacac2909586061a6f0beaaf222" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Wed Oct 26 19:46:13 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 26 19:46:13 2022 +0000" }, "message": "Fix errorprone warnings that should be errors am: 40710ba037\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/2255923\n\nChange-Id: I8eef66944e5ffb02858a210e929975b80d47af1f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "40710ba03774aeacac2909586061a6f0beaaf222", "tree": "4ab55381144af0b3d9e2889a9cb802734356598f", "parents": [ "0974b1a712c1688964c707f968a123be344bae9c" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Sat Oct 15 21:33:30 2022 -0700" }, "committer": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Sat Oct 15 21:33:30 2022 -0700" }, "message": "Fix errorprone warnings that should be errors\n\nThis commit is part of a large scale change to fix errorprone\nerrors that have been downgraded to warnings in the android\nsource tree, so that they can be promoted to errors again.\nThe full list of changes include the following, but not all\nwill be present in any one individual commit:\n\nBadAnnotationImplementation\nBadShiftAmount\nBanJNDI\nBoxedPrimitiveEquality\nComparableType\nComplexBooleanConstant\nCollectionToArraySafeParameter\nConditionalExpressionNumericPromotion\nDangerousLiteralNull\nDoubleBraceInitialization\nDurationFrom\nDurationTemporalUnit\nEmptyTopLevelDeclaration\nEqualsNull\nEqualsReference\nFormatString\nFromTemporalAccessor\nGetClassOnAnnotation\nGetClassOnClass\nHashtableContains\nIdentityBinaryExpression\nIdentityHashMapBoxing\nInstantTemporalUnit\nInvalidTimeZoneID\nInvalidZoneId\nIsInstanceIncompatibleType\nJUnitParameterMethodNotFound\nLockOnBoxedPrimitive\nMathRoundIntLong\nMislabeledAndroidString\nMisusedDayOfYear\nMissingSuperCall\nMisusedWeekYear\nModifyingCollectionWithItself\nNoCanIgnoreReturnValueOnClasses\nNonRuntimeAnnotation\nNullableOnContainingClass\nNullTernary\nOverridesJavaxInjectableMethod\nParcelableCreator\nPeriodFrom\nPreconditionsInvalidPlaceholder\nProtoBuilderReturnValueIgnored\nProtoFieldNullComparison\nRandomModInteger\nRectIntersectReturnValueIgnored\nReturnValueIgnored\nSelfAssignment\nSelfComparison\nSelfEquals\nSizeGreaterThanOrEqualsZero\nStringBuilderInitWithChar\nTreeToString\nTryFailThrowable\nUnnecessaryCheckNotNull\nUnusedCollectionModifiedInPlace\nXorPower\n\nSee https://errorprone.info/bugpatterns for more\ninformation on the checks.\n\nBug: 253827323\nTest: m RUN_ERROR_PRONE\u003dtrue javac-check\nChange-Id: I40fdda7a3ceee6d71b9cb184268a1b00972de086\n" }, { "commit": "49a812825bad5eb3f13ce65d80c43e18b4db9a3a", "tree": "9210e439b34f1c5f6837d9729d3755dfdde0989b", "parents": [ "5163ad65847492239a35941a9232efea7df7c9f6", "1e60812234164744156cdf8c52bba94f7f9fa961" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Mar 04 11:13:07 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Mar 04 11:13:07 2022 +0000" }, "message": "Move comment to license_note am: 12b92b4d00 am: 206eafeba4 am: 472ebb80bd am: 0974b1a712 am: 1e60812234\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/2008356\n\nChange-Id: I3be69057464be62900cc126fa7c4fbfef77702c8\n" }, { "commit": "5163ad65847492239a35941a9232efea7df7c9f6", "tree": "9210e439b34f1c5f6837d9729d3755dfdde0989b", "parents": [ "0ac1d86422655a26633a302896c7eb746d08e41a", "0974b1a712c1688964c707f968a123be344bae9c" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Mar 04 10:52:08 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Mar 04 10:52:08 2022 +0000" }, "message": "Move comment to license_note am: 12b92b4d00 am: 206eafeba4 am: 472ebb80bd am: 0974b1a712\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/2008356\n\nChange-Id: Id109eeaece4fa6b74e6b49d7c73ebdf0cd8c7165\n" }, { "commit": "1e60812234164744156cdf8c52bba94f7f9fa961", "tree": "9210e439b34f1c5f6837d9729d3755dfdde0989b", "parents": [ "0ac1d86422655a26633a302896c7eb746d08e41a", "0974b1a712c1688964c707f968a123be344bae9c" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Mar 04 10:51:03 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Mar 04 10:51:03 2022 +0000" }, "message": "Move comment to license_note am: 12b92b4d00 am: 206eafeba4 am: 472ebb80bd am: 0974b1a712\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/2008356\n\nChange-Id: Ief013ee041b7f122acb9257e565707215051df91\n" }, { "commit": "0974b1a712c1688964c707f968a123be344bae9c", "tree": "9210e439b34f1c5f6837d9729d3755dfdde0989b", "parents": [ "0ac1d86422655a26633a302896c7eb746d08e41a", "472ebb80bd337ae0a0b663f46d11c33236fc7543" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Mar 04 10:20:10 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Mar 04 10:20:10 2022 +0000" }, "message": "Move comment to license_note am: 12b92b4d00 am: 206eafeba4 am: 472ebb80bd\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/2008356\n\nChange-Id: Ie429bc69ddbfff0f80660b8467fba988206a3b81\n" }, { "commit": "472ebb80bd337ae0a0b663f46d11c33236fc7543", "tree": "9210e439b34f1c5f6837d9729d3755dfdde0989b", "parents": [ "3b3acc5c24fd5df42d621ec6df34a5b138001ee3", "206eafeba4cd4d60a8cc5d1afe38867188777782" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Mar 04 09:58:19 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Mar 04 09:58:19 2022 +0000" }, "message": "Move comment to license_note am: 12b92b4d00 am: 206eafeba4\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/2008356\n\nChange-Id: I87df4748c73fe24fd4db112e71d98bc5adf59541\n" }, { "commit": "206eafeba4cd4d60a8cc5d1afe38867188777782", "tree": "9210e439b34f1c5f6837d9729d3755dfdde0989b", "parents": [ "3b3acc5c24fd5df42d621ec6df34a5b138001ee3", "12b92b4d005aa51ae4845fefe82b0de4f15a3a6c" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Mar 04 09:34:08 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Mar 04 09:34:08 2022 +0000" }, "message": "Move comment to license_note am: 12b92b4d00\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/2008356\n\nChange-Id: I909cddaae1ff37393aa3c6420f581804116a093c\n" }, { "commit": "12b92b4d005aa51ae4845fefe82b0de4f15a3a6c", "tree": "9210e439b34f1c5f6837d9729d3755dfdde0989b", "parents": [ "3b3acc5c24fd5df42d621ec6df34a5b138001ee3" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Thu Mar 03 14:34:57 2022 -0800" }, "committer": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Thu Mar 03 14:34:57 2022 -0800" }, "message": "Move comment to license_note\n\nComments not preserved by refresh.\n\nTest: m nothing\nChange-Id: I1f811513f395b2591e9e43bf6708aefe68722f6b\n" }, { "commit": "0ac1d86422655a26633a302896c7eb746d08e41a", "tree": "d2a8615b53cbd8d2a5add45543e271b5664861d7", "parents": [ "69e41006b7f9fd1e4ffcffe04a429b4c50cda90d", "ee742e65532c1e8054f680e1a063950b4a25b7ff" ], "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: I1425c8d6297151cc03ffb5e8e600523db6bb904d\n" }, { "commit": "ee742e65532c1e8054f680e1a063950b4a25b7ff", "tree": "d2a8615b53cbd8d2a5add45543e271b5664861d7", "parents": [ "ee595c1d43c6bf75d47443829c82fb62de6e942c", "3b3acc5c24fd5df42d621ec6df34a5b138001ee3" ], "author": { "name": "Julien Desprez", "email": "jdesprez@google.com", "time": "Thu Feb 25 20:24:30 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 25 20:24:30 2021 +0000" }, "message": "Mark caliper-tests as not unit tests am: c584a577cd am: d5dbd458d3 am: 34343aad43 am: 3b3acc5c24\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/1605593\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I3d285e23a494e567fa8e3a74a4e50db2c47a4be6\n" }, { "commit": "69e41006b7f9fd1e4ffcffe04a429b4c50cda90d", "tree": "d2a8615b53cbd8d2a5add45543e271b5664861d7", "parents": [ "9039eb6374d8e5b84a6625feb1be465c784876a6", "3b3acc5c24fd5df42d621ec6df34a5b138001ee3" ], "author": { "name": "Julien Desprez", "email": "jdesprez@google.com", "time": "Thu Feb 25 20:23:57 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 25 20:23:57 2021 +0000" }, "message": "Mark caliper-tests as not unit tests am: c584a577cd am: d5dbd458d3 am: 34343aad43 am: 3b3acc5c24\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/1605593\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I276bdc51f29a872980e277cf7797cd1a4ca57db5\n" }, { "commit": "3b3acc5c24fd5df42d621ec6df34a5b138001ee3", "tree": "d2a8615b53cbd8d2a5add45543e271b5664861d7", "parents": [ "ac330ee3e64f98ca3b260e230253c86e3f72abf2", "34343aad43822053235fa0253cd58d3a3266042b" ], "author": { "name": "Julien Desprez", "email": "jdesprez@google.com", "time": "Thu Feb 25 19:46:56 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 25 19:46:56 2021 +0000" }, "message": "Mark caliper-tests as not unit tests am: c584a577cd am: d5dbd458d3 am: 34343aad43\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/1605593\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I2834e951011e8b7584b0a319ea520d8bdfcd878f\n" }, { "commit": "34343aad43822053235fa0253cd58d3a3266042b", "tree": "d2a8615b53cbd8d2a5add45543e271b5664861d7", "parents": [ "c8773969c13591865fc95f4e4dca428a4141a88e", "d5dbd458d31971ee39302cc5fe40fecdc16dc689" ], "author": { "name": "Julien Desprez", "email": "jdesprez@google.com", "time": "Thu Feb 25 19:06:19 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 25 19:06:19 2021 +0000" }, "message": "Mark caliper-tests as not unit tests am: c584a577cd am: d5dbd458d3\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/1605593\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I7b7b9ed4b16cc28535021e373d4ad66fb3e94525\n" }, { "commit": "d5dbd458d31971ee39302cc5fe40fecdc16dc689", "tree": "d2a8615b53cbd8d2a5add45543e271b5664861d7", "parents": [ "03fbd3376ec4e4cbb61bbd93b824cf462e304e8c", "c584a577cda484e022a6b01e04e90161697f2236" ], "author": { "name": "Julien Desprez", "email": "jdesprez@google.com", "time": "Thu Feb 25 18:08:30 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 25 18:08:30 2021 +0000" }, "message": "Mark caliper-tests as not unit tests am: c584a577cd\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/1605593\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I688d41c72acd91c53517191a6bb42ae25fc4d14a\n" }, { "commit": "c584a577cda484e022a6b01e04e90161697f2236", "tree": "d2a8615b53cbd8d2a5add45543e271b5664861d7", "parents": [ "e2309a4fbb5ac0febbd006f1c46445fc758faf7f" ], "author": { "name": "Julien Desprez", "email": "jdesprez@google.com", "time": "Wed Feb 24 17:03:17 2021 +0000" }, "committer": { "name": "Julien Desprez", "email": "jdesprez@google.com", "time": "Thu Feb 25 03:25:40 2021 +0000" }, "message": "Mark caliper-tests as not unit tests\n\nThey currently require some external jar which doesn\u0027t seem to be\npassed as data from the target.\n\nChange-Id: Iad340242cf3e6c90e6f02c685b9a685f3ab20e32\nTest: presubmit\nBug: 180736967\n" }, { "commit": "ee595c1d43c6bf75d47443829c82fb62de6e942c", "tree": "adea79d242f9eef48a1d7e2876d0bf5da6327111", "parents": [ "c03db87365bd94ecdf57d3911e1ed52fac8af559", "ac330ee3e64f98ca3b260e230253c86e3f72abf2" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Feb 16 23:17:48 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 23:17:48 2021 +0000" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to external/caliper am: e2309a4fbb am: 03fbd3376e am: c8773969c1 am: ac330ee3e6\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/1588889\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Id7e29f2530d7572655497b9317b95f51edbb7f31\n" }, { "commit": "9039eb6374d8e5b84a6625feb1be465c784876a6", "tree": "adea79d242f9eef48a1d7e2876d0bf5da6327111", "parents": [ "c03db87365bd94ecdf57d3911e1ed52fac8af559", "ac330ee3e64f98ca3b260e230253c86e3f72abf2" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Feb 16 23:17:20 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 23:17:20 2021 +0000" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to external/caliper am: e2309a4fbb am: 03fbd3376e am: c8773969c1 am: ac330ee3e6\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/1588889\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Ibc3d01f33495418e0e96f058539a40ca4a06f9f8\n" }, { "commit": "ac330ee3e64f98ca3b260e230253c86e3f72abf2", "tree": "adea79d242f9eef48a1d7e2876d0bf5da6327111", "parents": [ "c03db87365bd94ecdf57d3911e1ed52fac8af559", "c8773969c13591865fc95f4e4dca428a4141a88e" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Feb 16 23:02:15 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 23:02:15 2021 +0000" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to external/caliper am: e2309a4fbb am: 03fbd3376e am: c8773969c1\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/1588889\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Ib53a8bb2ad7e8107d261d4621f6332b3592811fc\n" }, { "commit": "c8773969c13591865fc95f4e4dca428a4141a88e", "tree": "adea79d242f9eef48a1d7e2876d0bf5da6327111", "parents": [ "14784d62cea81001c6c97296930dfd0b3184e525", "03fbd3376ec4e4cbb61bbd93b824cf462e304e8c" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Feb 16 22:23:18 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 22:23:18 2021 +0000" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to external/caliper am: e2309a4fbb am: 03fbd3376e\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/1588889\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Ie99835d55b40a60c5c2e189722a034e02f900574\n" }, { "commit": "03fbd3376ec4e4cbb61bbd93b824cf462e304e8c", "tree": "adea79d242f9eef48a1d7e2876d0bf5da6327111", "parents": [ "ab25e665b5eeb648e7d489232c428ab8124e76d0", "e2309a4fbb5ac0febbd006f1c46445fc758faf7f" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Feb 16 21:45:43 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 21:45:43 2021 +0000" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to external/caliper am: e2309a4fbb\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/1588889\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Ife5941d7b74c75d68883cb9be7e00cba9fee23c2\n" }, { "commit": "e2309a4fbb5ac0febbd006f1c46445fc758faf7f", "tree": "adea79d242f9eef48a1d7e2876d0bf5da6327111", "parents": [ "21eae118bc65a40ff0eada8922bce9943c80334b" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 12 20:14:05 2021 -0800" }, "committer": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 12 20:14:05 2021 -0800" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to external/caliper\n\nAdded SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-CDDL\n SPDX-license-identifier-CDDL-1.0 SPDX-license-identifier-GPL\n SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL\nto:\n Android.bp\n\nBug: 68860345\nBug: 151177513\nBug: 151953481\n\nTest: m all\n\nExempt-From-Owner-Approval: janitorial work\nChange-Id: I6fa5e781c1bbf9c1f65687e2ecc2af9081dd5746\n" }, { "commit": "c03db87365bd94ecdf57d3911e1ed52fac8af559", "tree": "93c1f99db1dce334d49314447040a4d57cacf06a", "parents": [ "4644eddbac2593c23bd2fe7fced5b367e0b28cc6", "14784d62cea81001c6c97296930dfd0b3184e525" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Mon Jan 25 23:42:43 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jan 25 23:42:43 2021 +0000" }, "message": "Fix license_type. Contains GPL am: 21eae118bc am: ab25e665b5 am: 14784d62ce\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/1556997\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Ib9fc4d1304deb4e087ee6068d0f023dde63817c0\n" }, { "commit": "14784d62cea81001c6c97296930dfd0b3184e525", "tree": "93c1f99db1dce334d49314447040a4d57cacf06a", "parents": [ "1acec160e1477a59f40df4dd3dd717b70df57dc0", "ab25e665b5eeb648e7d489232c428ab8124e76d0" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Mon Jan 25 23:24:36 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jan 25 23:24:36 2021 +0000" }, "message": "Fix license_type. Contains GPL am: 21eae118bc am: ab25e665b5\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/1556997\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Iedac98cc827ad8bf60159ca699ccc748e1fdcf56\n" }, { "commit": "ab25e665b5eeb648e7d489232c428ab8124e76d0", "tree": "93c1f99db1dce334d49314447040a4d57cacf06a", "parents": [ "1acec160e1477a59f40df4dd3dd717b70df57dc0", "21eae118bc65a40ff0eada8922bce9943c80334b" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Mon Jan 25 23:01:57 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jan 25 23:01:57 2021 +0000" }, "message": "Fix license_type. Contains GPL am: 21eae118bc\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/1556997\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Iaa2d8321545a93c525d585304c3bcc494860c518\n" }, { "commit": "21eae118bc65a40ff0eada8922bce9943c80334b", "tree": "93c1f99db1dce334d49314447040a4d57cacf06a", "parents": [ "1acec160e1477a59f40df4dd3dd717b70df57dc0" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Thu Jan 21 11:19:05 2021 -0800" }, "committer": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Thu Jan 21 18:25:55 2021 -0800" }, "message": "Fix license_type. Contains GPL\n\nSee: http://go/android-license-checking-v2-lsc\n\nTest: m all\n\nBug: 151953481\nBug: 151177513\nBug: 67772237\nChange-Id: Ie8271bf516a398548df55d70f258b257dd3ea878\n" }, { "commit": "4644eddbac2593c23bd2fe7fced5b367e0b28cc6", "tree": "be69e76427cf49b2b8b1b56d0bb7231ca60c917e", "parents": [ "32f7c560bc2e77925a87648111a7863bf4a23306", "1acec160e1477a59f40df4dd3dd717b70df57dc0" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Jun 26 17:34:50 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 26 17:34:50 2020 +0000" }, "message": "Use jsr330 instead of dagger2-inject am: f0a3eafc7e am: e6d8472121 am: 541ef698bd am: fe5febf701 am: 1acec160e1\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/1350864\n\nChange-Id: I8780f308867d19aa7d761fd72a774563236c9a29\n" }, { "commit": "1acec160e1477a59f40df4dd3dd717b70df57dc0", "tree": "be69e76427cf49b2b8b1b56d0bb7231ca60c917e", "parents": [ "76a4ce056a9bfdca8f39359a127dd6e6cf413737", "fe5febf701837fa20628b818c8f8a3c068f97486" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Jun 26 17:21:28 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 26 17:21:28 2020 +0000" }, "message": "Use jsr330 instead of dagger2-inject am: f0a3eafc7e am: e6d8472121 am: 541ef698bd am: fe5febf701\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/1350864\n\nChange-Id: I5aad84b8f889049f5f9bf3925b781a37bfce219d\n" }, { "commit": "fe5febf701837fa20628b818c8f8a3c068f97486", "tree": "be69e76427cf49b2b8b1b56d0bb7231ca60c917e", "parents": [ "7096554c07f55c8b7f866bc68988ed1f5ade2876", "541ef698bd9013cbf4098ff21e661870e26f08d3" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Jun 26 17:08:58 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 26 17:08:58 2020 +0000" }, "message": "Use jsr330 instead of dagger2-inject am: f0a3eafc7e am: e6d8472121 am: 541ef698bd\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/1350864\n\nChange-Id: I6a616433371ac92287b09a405ed937f10042efc1\n" }, { "commit": "541ef698bd9013cbf4098ff21e661870e26f08d3", "tree": "be69e76427cf49b2b8b1b56d0bb7231ca60c917e", "parents": [ "7892f39d5c91588750476fc8944f33638567be25", "e6d8472121344c38ca17ce2501e62a827b17ea4f" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Jun 26 16:54:30 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 26 16:54:30 2020 +0000" }, "message": "Use jsr330 instead of dagger2-inject am: f0a3eafc7e am: e6d8472121\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/1350864\n\nChange-Id: Ifed6001a21201522a77e5f3bc94a5f53f457e9a4\n" }, { "commit": "e6d8472121344c38ca17ce2501e62a827b17ea4f", "tree": "be69e76427cf49b2b8b1b56d0bb7231ca60c917e", "parents": [ "e66828ca36bd5eb29473f9a761d684528b2d4346", "f0a3eafc7ecccfa7adbb08dcf455545ace087a43" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Jun 26 16:43:49 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 26 16:43:49 2020 +0000" }, "message": "Use jsr330 instead of dagger2-inject am: f0a3eafc7e\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/caliper/+/1350864\n\nChange-Id: I62c83aa8b0be5422ad36a8524c5cd4176e1f8aa7\n" }, { "commit": "f0a3eafc7ecccfa7adbb08dcf455545ace087a43", "tree": "be69e76427cf49b2b8b1b56d0bb7231ca60c917e", "parents": [ "e66828ca36bd5eb29473f9a761d684528b2d4346" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Jun 25 23:17:29 2020 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Jun 25 23:17:29 2020 -0700" }, "message": "Use jsr330 instead of dagger2-inject\n\nUse external/jsr330 instead of the local dagger2-inject prebuilts.\n\nBug: 158870037\nTest: m checkbuild\nChange-Id: I3ab3ac5af6039c0d8a68c5a893ca902ca7d7e5ff\n" }, { "commit": "32f7c560bc2e77925a87648111a7863bf4a23306", "tree": "2e2e105cd0a1155174bb29941f9a4b55789b020d", "parents": [ "8180ab2636a5314cce94f4886033eb1494ba45d2", "76a4ce056a9bfdca8f39359a127dd6e6cf413737" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Mon Apr 27 22:32:40 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 27 22:32:40 2020 +0000" }, "message": "Add license type: Apache2 is a NOTICE license am: 297612b7c2 am: e66828ca36 am: 7892f39d5c am: 7096554c07 am: 76a4ce056a\n\nChange-Id: If63d77c09fb738d5116ca139168af95111fbdb3b\n" }, { "commit": "76a4ce056a9bfdca8f39359a127dd6e6cf413737", "tree": "2e2e105cd0a1155174bb29941f9a4b55789b020d", "parents": [ "8180ab2636a5314cce94f4886033eb1494ba45d2", "7096554c07f55c8b7f866bc68988ed1f5ade2876" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Mon Apr 27 22:17:45 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 27 22:17:45 2020 +0000" }, "message": "Add license type: Apache2 is a NOTICE license am: 297612b7c2 am: e66828ca36 am: 7892f39d5c am: 7096554c07\n\nChange-Id: Ia2913cba0f2bed6f958aba394330580f24364cc0\n" }, { "commit": "7096554c07f55c8b7f866bc68988ed1f5ade2876", "tree": "2e2e105cd0a1155174bb29941f9a4b55789b020d", "parents": [ "8180ab2636a5314cce94f4886033eb1494ba45d2", "7892f39d5c91588750476fc8944f33638567be25" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Mon Apr 27 22:05:53 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 27 22:05:53 2020 +0000" }, "message": "Add license type: Apache2 is a NOTICE license am: 297612b7c2 am: e66828ca36 am: 7892f39d5c\n\nChange-Id: Ic22726eaf26fc697b541dcb76ed7ac184c37c32f\n" }, { "commit": "7892f39d5c91588750476fc8944f33638567be25", "tree": "2e2e105cd0a1155174bb29941f9a4b55789b020d", "parents": [ "8180ab2636a5314cce94f4886033eb1494ba45d2", "e66828ca36bd5eb29473f9a761d684528b2d4346" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Mon Apr 27 21:48:12 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 27 21:48:12 2020 +0000" }, "message": "Add license type: Apache2 is a NOTICE license am: 297612b7c2 am: e66828ca36\n\nChange-Id: I41f1f4e9e9f6c57c55fbdc3e45c321fab762b714\n" }, { "commit": "e66828ca36bd5eb29473f9a761d684528b2d4346", "tree": "2e2e105cd0a1155174bb29941f9a4b55789b020d", "parents": [ "89cb92050512ed307a9896a07444e7c12cf0a3ee", "297612b7c27caae30f61fc6c194da8148c94b7fb" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Mon Apr 27 21:33:34 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 27 21:33:34 2020 +0000" }, "message": "Add license type: Apache2 is a NOTICE license am: 297612b7c2\n\nChange-Id: Id5123ec123ee59b25784e57a9944f80843ace9d2\n" }, { "commit": "297612b7c27caae30f61fc6c194da8148c94b7fb", "tree": "2e2e105cd0a1155174bb29941f9a4b55789b020d", "parents": [ "89cb92050512ed307a9896a07444e7c12cf0a3ee" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Thu Apr 23 16:32:33 2020 -0700" }, "committer": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Mon Apr 27 12:53:08 2020 -0700" }, "message": "Add license type: Apache2 is a NOTICE license\n\nBug: 68860345\nBug: 69058154\nBug: 151953481\n\nTest: no code changes\n\nExempt-From-Owner-Approval: janitorial work\n\nChange-Id: I1c51ab903ef673b3bcfc2d1f4b0d6afab3e57661\n" }, { "commit": "8180ab2636a5314cce94f4886033eb1494ba45d2", "tree": "a257c2c8d15861206616f78cd708e8ef786fdf98", "parents": [ "93ab808e8681dd621763e44e066663ab3b5777c3", "89cb92050512ed307a9896a07444e7c12cf0a3ee" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Thu Jul 04 00:12:31 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 04 00:12:31 2019 -0700" }, "message": "Fix include syntax on libcore/OWNERS file am: 01bfdfe057 am: 6469f304ad am: a3c9bde9b6\nam: 89cb920505\n\nChange-Id: I302365e2f6c20f4ff9ab4d0ad7e38f819855c2b4\n" }, { "commit": "89cb92050512ed307a9896a07444e7c12cf0a3ee", "tree": "a257c2c8d15861206616f78cd708e8ef786fdf98", "parents": [ "0345adc02f78b136460bc62ed86c6718fc83b15d", "a3c9bde9b6bb0b3ee558feabced355383129258b" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Wed Jul 03 22:35:27 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 03 22:35:27 2019 -0700" }, "message": "Fix include syntax on libcore/OWNERS file am: 01bfdfe057 am: 6469f304ad\nam: a3c9bde9b6\n\nChange-Id: I1d7b8720d6adc7a1e922b1f18b1f4171db72ba0d\n" }, { "commit": "a3c9bde9b6bb0b3ee558feabced355383129258b", "tree": "a257c2c8d15861206616f78cd708e8ef786fdf98", "parents": [ "e52b6c94b6ce339e611e6a7f70321b09852afbf1", "6469f304ad5a3892f1d7382d92aa3e8ee1611dc0" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Wed Jul 03 22:12:30 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 03 22:12:30 2019 -0700" }, "message": "Fix include syntax on libcore/OWNERS file am: 01bfdfe057\nam: 6469f304ad\n\nChange-Id: Ie35ae9a3cf35803bb9ab30f01f5dd08cb7657ff3\n" }, { "commit": "6469f304ad5a3892f1d7382d92aa3e8ee1611dc0", "tree": "a257c2c8d15861206616f78cd708e8ef786fdf98", "parents": [ "85d42cf3e1418807dda458ac47ce8a84eddc846b", "01bfdfe0572d53252e412095883163a11878ccb4" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Wed Jul 03 22:01:48 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 03 22:01:48 2019 -0700" }, "message": "Fix include syntax on libcore/OWNERS file\nam: 01bfdfe057\n\nChange-Id: I42cc205a0abed35b6ba865248f7dac5d4aba1676\n" }, { "commit": "01bfdfe0572d53252e412095883163a11878ccb4", "tree": "a257c2c8d15861206616f78cd708e8ef786fdf98", "parents": [ "7bbbcc73b4ec92311b63c5742adebf6b33038c3c" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Wed Jul 03 15:11:36 2019 +0100" }, "committer": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Wed Jul 03 15:11:36 2019 +0100" }, "message": "Fix include syntax on libcore/OWNERS file\n\nThe syntax requires the project to be specified\nas a prefix.\n\nChange-Id: I10c9b98cf2df8e43eed1bbf2c30e8f5bd55135d2\nExempt-From-Owner-Approval: Fixes OWNERS\nTest: None\n" }, { "commit": "93ab808e8681dd621763e44e066663ab3b5777c3", "tree": "2228d5b90d39e4183d07ef94e5a552d770124069", "parents": [ "8aed58d9bf08d0c451b5fc5e03ca0487c6c9601e", "0345adc02f78b136460bc62ed86c6718fc83b15d" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Tue Jul 02 17:26:23 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 02 17:26:23 2019 -0700" }, "message": "Update OWNERS to reference libcore\u0027s OWNERS file am: 7bbbcc73b4 am: 85d42cf3e1 am: e52b6c94b6\nam: 0345adc02f\n\nChange-Id: Ifdbac85fd48bcb3341bbecf5b21103ed5822b58c\n" }, { "commit": "0345adc02f78b136460bc62ed86c6718fc83b15d", "tree": "2228d5b90d39e4183d07ef94e5a552d770124069", "parents": [ "92e541a0b4b3eb944fa4d156177a4ce7d1d8daf2", "e52b6c94b6ce339e611e6a7f70321b09852afbf1" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Tue Jul 02 16:16:24 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 02 16:16:24 2019 -0700" }, "message": "Update OWNERS to reference libcore\u0027s OWNERS file am: 7bbbcc73b4 am: 85d42cf3e1\nam: e52b6c94b6\n\nChange-Id: If27a58b2b8acd36ca781bc79a233970b6e0a66da\n" }, { "commit": "e52b6c94b6ce339e611e6a7f70321b09852afbf1", "tree": "2228d5b90d39e4183d07ef94e5a552d770124069", "parents": [ "76ef149620d0424859ba3974ff47a5233fe4c407", "85d42cf3e1418807dda458ac47ce8a84eddc846b" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Tue Jul 02 15:22:08 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 02 15:22:08 2019 -0700" }, "message": "Update OWNERS to reference libcore\u0027s OWNERS file am: 7bbbcc73b4\nam: 85d42cf3e1\n\nChange-Id: I37b88427b5019b5a8fbad76a2857b84f2df14609\n" }, { "commit": "85d42cf3e1418807dda458ac47ce8a84eddc846b", "tree": "2228d5b90d39e4183d07ef94e5a552d770124069", "parents": [ "76ef149620d0424859ba3974ff47a5233fe4c407", "7bbbcc73b4ec92311b63c5742adebf6b33038c3c" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Tue Jul 02 10:17:34 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 02 10:17:34 2019 -0700" }, "message": "Update OWNERS to reference libcore\u0027s OWNERS file\nam: 7bbbcc73b4\n\nChange-Id: I9b8a4c74cec3fdda9bdf2ce832126dfa59db4fb6\n" }, { "commit": "7bbbcc73b4ec92311b63c5742adebf6b33038c3c", "tree": "2228d5b90d39e4183d07ef94e5a552d770124069", "parents": [ "6d6b39bbc8fb84120c449838b68ed11d55ba2770" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Tue Jul 02 10:39:28 2019 +0100" }, "committer": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Tue Jul 02 10:39:28 2019 +0100" }, "message": "Update OWNERS to reference libcore\u0027s OWNERS file\n\nUpdate OWNERS to reference libcore\u0027s OWNERS file\n\nTest: ls ../../libcore/OWNERS\nChange-Id: I467d6c22dfce6e038522ac91d29d109322d47384\n" }, { "commit": "8aed58d9bf08d0c451b5fc5e03ca0487c6c9601e", "tree": "1f6a2675d2c8e8defc8f5a27a24b62ab5bc938d4", "parents": [ "996ba83a8e76919677849d963171ecfef6af0a50", "92e541a0b4b3eb944fa4d156177a4ce7d1d8daf2" ], "author": { "name": "Pete Gillin", "email": "peteg@google.com", "time": "Wed Jun 05 04:40:02 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 05 04:40:02 2019 -0700" }, "message": "Revert \"Fix annotation processors working w/ generated code on OpenJDK 9 toolchain\" am: 6d6b39bbc8 am: 0908939b5a am: 76ef149620\nam: 92e541a0b4\n\nChange-Id: I010a477ed72ac1ee6f2b7f7d968438f3cdb7e144\n" }, { "commit": "92e541a0b4b3eb944fa4d156177a4ce7d1d8daf2", "tree": "1f6a2675d2c8e8defc8f5a27a24b62ab5bc938d4", "parents": [ "631bf74b4c314431bf9ab522d87cd6eb1ecb4340", "76ef149620d0424859ba3974ff47a5233fe4c407" ], "author": { "name": "Pete Gillin", "email": "peteg@google.com", "time": "Wed Jun 05 04:35:08 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 05 04:35:08 2019 -0700" }, "message": "Revert \"Fix annotation processors working w/ generated code on OpenJDK 9 toolchain\" am: 6d6b39bbc8 am: 0908939b5a\nam: 76ef149620\n\nChange-Id: I770b092c9487b1de89147589f6f62c9993647e1b\n" }, { "commit": "76ef149620d0424859ba3974ff47a5233fe4c407", "tree": "1f6a2675d2c8e8defc8f5a27a24b62ab5bc938d4", "parents": [ "631bf74b4c314431bf9ab522d87cd6eb1ecb4340", "0908939b5ac04d419ef974b12680ca658ee1b82a" ], "author": { "name": "Pete Gillin", "email": "peteg@google.com", "time": "Wed Jun 05 04:30:06 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 05 04:30:06 2019 -0700" }, "message": "Revert \"Fix annotation processors working w/ generated code on OpenJDK 9 toolchain\" am: 6d6b39bbc8\nam: 0908939b5a\n\nChange-Id: I8744068f9324d63d8f7169a1fa3077fb73b99485\n" }, { "commit": "0908939b5ac04d419ef974b12680ca658ee1b82a", "tree": "1f6a2675d2c8e8defc8f5a27a24b62ab5bc938d4", "parents": [ "e0063647591ebda813559d621ac634e162107cf8", "6d6b39bbc8fb84120c449838b68ed11d55ba2770" ], "author": { "name": "Pete Gillin", "email": "peteg@google.com", "time": "Wed Jun 05 04:23:58 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 05 04:23:58 2019 -0700" }, "message": "Revert \"Fix annotation processors working w/ generated code on OpenJDK 9 toolchain\"\nam: 6d6b39bbc8\n\nChange-Id: I70cbea54bc3231d1536ad150eaf8765a366569a4\n" }, { "commit": "6d6b39bbc8fb84120c449838b68ed11d55ba2770", "tree": "1f6a2675d2c8e8defc8f5a27a24b62ab5bc938d4", "parents": [ "e0063647591ebda813559d621ac634e162107cf8" ], "author": { "name": "Pete Gillin", "email": "peteg@google.com", "time": "Tue Jun 04 16:06:25 2019 +0100" }, "committer": { "name": "Pete Gillin", "email": "peteg@google.com", "time": "Tue Jun 04 16:54:34 2019 +0100" }, "message": "Revert \"Fix annotation processors working w/ generated code on OpenJDK 9 toolchain\"\n\nThis change is no longer needed, following http://r.android.com/943770\nin April 2019, which upgraded external/dagger2 from a 2015 version of\nauto-common to version 0.10\n(https://github.com/google/auto/releases/tag/auto-common-0.10). This\nauto-common version does not output code using\njavax.annotation.Generated if it is is not available, so the module\nthat provides (java.xml.ws.annotation) it can be safely removed.\n\nThis is beneficial since the module is deprecated in OpenJDK 9 and is\nremoved in later versions.\n\nN.B. The change being reverted was to Android.mk, this removes the\ncorresponding lines from the migrated Android.bp.\n\nThis reverts commit 55f01c365aae9197a2c6b08116bbdb6ca02b8733.\n\nBug: 62050818\nBug: 131683177\nTest: EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9\u003dtrue make droid\nChange-Id: I7fd3437c31d3a4ca93f9df8782eb843fa95841da\n" }, { "commit": "996ba83a8e76919677849d963171ecfef6af0a50", "tree": "809cf651183fa6a3b3d0e6ded61ce966b453d8f5", "parents": [ "d1d394bdc80b10c66878ae0c71b7d05a334168bc", "631bf74b4c314431bf9ab522d87cd6eb1ecb4340" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Apr 16 19:48:46 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Apr 16 19:48:46 2019 -0700" }, "message": "[automerger skipped] Update caliper for guava 27.1 am: 4d25eeab84 am: e006364759 -s ours\nam: 631bf74b4c -s ours\nam skip reason: change_id I23e13f4073a45b688b1df59d6573625e5a893106 with SHA1 5224dab50f is in history\n\nChange-Id: Ifeac61b5eae2e5cc3c95262a536cdf82413f1da0\n" }, { "commit": "631bf74b4c314431bf9ab522d87cd6eb1ecb4340", "tree": "809cf651183fa6a3b3d0e6ded61ce966b453d8f5", "parents": [ "5224dab50f25dfcd18c4a2f448e84ca7d1ae6574", "e0063647591ebda813559d621ac634e162107cf8" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Apr 16 17:15:11 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Apr 16 17:15:11 2019 -0700" }, "message": "[automerger skipped] Update caliper for guava 27.1 am: 4d25eeab84\nam: e006364759 -s ours\nam skip reason: change_id I23e13f4073a45b688b1df59d6573625e5a893106 with SHA1 5224dab50f is in history\n\nChange-Id: Id36f4b0c913703d98f801384549163ac41e16a61\n" }, { "commit": "e0063647591ebda813559d621ac634e162107cf8", "tree": "809cf651183fa6a3b3d0e6ded61ce966b453d8f5", "parents": [ "e8343dbcb615262f408f69eaa8ea5920d641c38b", "4d25eeab84f983c811d24b93b233af868f5112aa" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Apr 16 16:31:47 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Apr 16 16:31:47 2019 -0700" }, "message": "Update caliper for guava 27.1\nam: 4d25eeab84\n\nChange-Id: Ib96846dbb196512b58a6fc7c58f0e007348cbff7\n" }, { "commit": "4d25eeab84f983c811d24b93b233af868f5112aa", "tree": "809cf651183fa6a3b3d0e6ded61ce966b453d8f5", "parents": [ "7b011293a00f712f1887504ca68459b493601ffd" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Apr 11 14:26:19 2019 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Apr 15 21:44:59 2019 -0700" }, "message": "Update caliper for guava 27.1\n\nThe current version of caliper is not compatible with guava 27.1. In\norder to decouple updating guava from updating caliper, this CL does\nthe minimal changes to caliper to compile with guava 27.1. It should\nideally be reverted and replaced with merging an upstream version of\ncaliper that supports guava 27.1.\n\nUse java 1.8 to get the new default method in the Predicate interface.\n@Provides(type \u003d Type.SET) has been replaced with @Provides @IntoSet.\n\nFutures.withFallback has been replaced with Futures.catchingAsync.\n\nError Prone now requires checking the return value of\nListeningExecutorService.submit.\n\nBug: 130306229\nTest: m checkbuild\nChange-Id: I23e13f4073a45b688b1df59d6573625e5a893106\nMerged-In: I23e13f4073a45b688b1df59d6573625e5a893106\nExempt-From-Owner-Approval: cherry pick\n(cherry picked from commit 5224dab50f25dfcd18c4a2f448e84ca7d1ae6574)\n" }, { "commit": "d1d394bdc80b10c66878ae0c71b7d05a334168bc", "tree": "809cf651183fa6a3b3d0e6ded61ce966b453d8f5", "parents": [ "fed431afe2537c1d6c4930d58fe71ff0ca084c0b", "5224dab50f25dfcd18c4a2f448e84ca7d1ae6574" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Apr 15 21:31:03 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Apr 15 21:31:03 2019 -0700" }, "message": "Update caliper for guava 27.1\nam: 5224dab50f\n\nChange-Id: Ia88fdff5d5a436ddb6fa4f9a0ca72e9eb6545574\n" }, { "commit": "5224dab50f25dfcd18c4a2f448e84ca7d1ae6574", "tree": "809cf651183fa6a3b3d0e6ded61ce966b453d8f5", "parents": [ "fed431afe2537c1d6c4930d58fe71ff0ca084c0b" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Apr 11 14:26:19 2019 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Apr 12 22:21:09 2019 -0700" }, "message": "Update caliper for guava 27.1\n\nThe current version of caliper is not compatible with guava 27.1. In\norder to decouple updating guava from updating caliper, this CL does\nthe minimal changes to caliper to compile with guava 27.1. It should\nideally be reverted and replaced with merging an upstream version of\ncaliper that supports guava 27.1.\n\nUse java 1.8 to get the new default method in the Predicate interface.\n@Provides(type \u003d Type.SET) has been replaced with @Provides @IntoSet.\n\nFutures.withFallback has been replaced with Futures.catchingAsync.\n\nError Prone now requires checking the return value of\nListeningExecutorService.submit.\n\nBug: 130306229\nTest: m checkbuild\nChange-Id: I23e13f4073a45b688b1df59d6573625e5a893106\n" }, { "commit": "fed431afe2537c1d6c4930d58fe71ff0ca084c0b", "tree": "100525f5e98bcc45d26d28045641d76ab7a6337b", "parents": [ "02061ca2c5772519b4483240de2ccd53a38968aa", "2741fe00d4680ac06dea784224d437e5df14871d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Feb 25 05:07:45 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Feb 25 05:07:45 2019 -0800" }, "message": "Merge stage-aosp-master into pi-dev-plus-aosp\nam: 2741fe00d4\n\nChange-Id: Ie86a297815c52ae187ea1d9949a38da1971e7a4e\n" }, { "commit": "2741fe00d4680ac06dea784224d437e5df14871d", "tree": "100525f5e98bcc45d26d28045641d76ab7a6337b", "parents": [ "55747683821fae754c5090f7eefbcd05b952c2a0", "e8343dbcb615262f408f69eaa8ea5920d641c38b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Feb 25 00:27:52 2019 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Feb 25 00:27:52 2019 -0800" }, "message": "Merge stage-aosp-master into pi-dev-plus-aosp\n\nBug: 126125118\nChange-Id: Ic4072d3b3484f2054fdc2b3be6b72beb18989872\n" }, { "commit": "e8343dbcb615262f408f69eaa8ea5920d641c38b", "tree": "100525f5e98bcc45d26d28045641d76ab7a6337b", "parents": [ "9d6a8aa403aa505943a47ea2148d19db3563b09d", "a851d446a514d1e04658a582f58b790d909c6c92" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Feb 20 16:18:14 2019 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Feb 20 16:18:14 2019 -0800" }, "message": "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master\n\nBug: 120848293\nChange-Id: Ic1d780723b9de1ec7800224034e979eb0b54ab1e\n" }, { "commit": "02061ca2c5772519b4483240de2ccd53a38968aa", "tree": "100525f5e98bcc45d26d28045641d76ab7a6337b", "parents": [ "a4c578700022addf80a8ef1199267ff245e3a619", "55747683821fae754c5090f7eefbcd05b952c2a0" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jan 23 12:55:39 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jan 23 12:55:39 2019 -0800" }, "message": "Replace annotation_processors with plugins am: 7b011293a0 am: 9d6a8aa403\nam: 5574768382\n\nChange-Id: I189d03a8f464af98bf13ff2552ea49b0e4f55529\n" }, { "commit": "55747683821fae754c5090f7eefbcd05b952c2a0", "tree": "100525f5e98bcc45d26d28045641d76ab7a6337b", "parents": [ "a851d446a514d1e04658a582f58b790d909c6c92", "9d6a8aa403aa505943a47ea2148d19db3563b09d" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jan 23 12:44:27 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jan 23 12:44:27 2019 -0800" }, "message": "Replace annotation_processors with plugins am: 7b011293a0\nam: 9d6a8aa403\n\nChange-Id: Iab203e7c20ce714da0b39503980a95ed3c1659ad\n" }, { "commit": "9d6a8aa403aa505943a47ea2148d19db3563b09d", "tree": "100525f5e98bcc45d26d28045641d76ab7a6337b", "parents": [ "c5ca429b6d4331b1d46f9fdf49dcac834a0eb22d", "7b011293a00f712f1887504ca68459b493601ffd" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jan 23 12:32:37 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jan 23 12:32:37 2019 -0800" }, "message": "Replace annotation_processors with plugins\nam: 7b011293a0\n\nChange-Id: I5f79dfbf2885bfbd01cbebe7d5a0e2ed01c7ad6e\n" }, { "commit": "7b011293a00f712f1887504ca68459b493601ffd", "tree": "100525f5e98bcc45d26d28045641d76ab7a6337b", "parents": [ "ca1021253184c55c90f5cbbea3fc8bc3f164c151" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Jan 21 21:42:47 2019 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Jan 21 21:42:47 2019 -0800" }, "message": "Replace annotation_processors with plugins\n\nThe annotation_processors property is deprecated, replace it with\nplugins.\n\nBug: 77284273\nTest: m checkbuild\nChange-Id: Ie4a64da00403c8899207d3857c73227341ea13e7\n" }, { "commit": "a4c578700022addf80a8ef1199267ff245e3a619", "tree": "5b3fc23d58e987c696619bb85358bdf9aa9dabc1", "parents": [ "8bcec1d641b72d72a33c5980082e5ac5d2f7c68d", "a851d446a514d1e04658a582f58b790d909c6c92" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 24 18:29:24 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 24 18:29:24 2018 -0700" }, "message": "[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: ca10212531 -s ours am: c5ca429b6d -s ours\nam: a851d446a5 -s ours\n\nChange-Id: I1ab60c08d56a4f706ccb7da21c520f69059657b3\n" }, { "commit": "a851d446a514d1e04658a582f58b790d909c6c92", "tree": "5b3fc23d58e987c696619bb85358bdf9aa9dabc1", "parents": [ "9652cc0649abba9916a56e0e454eaaaf2d7571d2", "c5ca429b6d4331b1d46f9fdf49dcac834a0eb22d" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 24 18:14:48 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 24 18:14:48 2018 -0700" }, "message": "[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: ca10212531 -s ours\nam: c5ca429b6d -s ours\n\nChange-Id: I895dc0e8fd07baa2fee6341e32bafab4f5cfd0d7\n" }, { "commit": "c5ca429b6d4331b1d46f9fdf49dcac834a0eb22d", "tree": "5b3fc23d58e987c696619bb85358bdf9aa9dabc1", "parents": [ "c770b49a4579d62180abadf3452eef0b57cb7a63", "ca1021253184c55c90f5cbbea3fc8bc3f164c151" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 24 15:28:18 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 24 15:28:18 2018 -0700" }, "message": "[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE\nam: ca10212531 -s ours\n\nChange-Id: I9c53fbe64432951046d25295f69c7645fe2c1375\n" }, { "commit": "ca1021253184c55c90f5cbbea3fc8bc3f164c151", "tree": "5b3fc23d58e987c696619bb85358bdf9aa9dabc1", "parents": [ "d0f6db485e6e2d1b33df462bd399005c88b5f5b2", "6c497e02a737a943486cf6d58e83c122c46eb321" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 24 14:45:41 2018 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 24 14:45:41 2018 -0700" }, "message": "Merge pie-platform-release to aosp-master - DO NOT MERGE\n\nChange-Id: I1af8b1fc4272172eb1c478e180d42753ed6effa3\n" }, { "commit": "8bcec1d641b72d72a33c5980082e5ac5d2f7c68d", "tree": "5b3fc23d58e987c696619bb85358bdf9aa9dabc1", "parents": [ "479ebd0e88ae929933af682440031a7b609e4236", "9652cc0649abba9916a56e0e454eaaaf2d7571d2" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 24 11:28:45 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 24 11:28:45 2018 -0700" }, "message": "[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: c770b49a45 -s ours\nam: 9652cc0649 -s ours\n\nChange-Id: I91ce56a0aca06cc3d6921c05964f0fcacf88d613\n" }, { "commit": "9652cc0649abba9916a56e0e454eaaaf2d7571d2", "tree": "5b3fc23d58e987c696619bb85358bdf9aa9dabc1", "parents": [ "e1346e96119db5ab4f6be6f1f29e4d37887f9eda", "c770b49a4579d62180abadf3452eef0b57cb7a63" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 24 11:08:03 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 24 11:08:03 2018 -0700" }, "message": "[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE\nam: c770b49a45 -s ours\n\nChange-Id: I9de1df3033f9e1502d37f70a7d260d8b44474e2f\n" }, { "commit": "c770b49a4579d62180abadf3452eef0b57cb7a63", "tree": "5b3fc23d58e987c696619bb85358bdf9aa9dabc1", "parents": [ "d0f6db485e6e2d1b33df462bd399005c88b5f5b2", "6c497e02a737a943486cf6d58e83c122c46eb321" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 24 09:05:25 2018 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 24 09:05:25 2018 -0700" }, "message": "Merge pi-platform-release to stage-aosp-master - DO NOT MERGE\n\nChange-Id: Id1397644a75d796243b0ab065f0b1504ed29acb3\n" }, { "commit": "479ebd0e88ae929933af682440031a7b609e4236", "tree": "5b3fc23d58e987c696619bb85358bdf9aa9dabc1", "parents": [ "2077eddc6d5aaa0512ef834683ba8bf6ff6d0d59", "e1346e96119db5ab4f6be6f1f29e4d37887f9eda" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Wed Oct 10 09:34:07 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 10 09:34:07 2018 -0700" }, "message": "Compile caliper target against core_current am: 03996baab8 am: d0f6db485e\nam: e1346e9611\n\nChange-Id: I8ddcfd489072aba47abb298404a0e9fe30d87832\n" }, { "commit": "e1346e96119db5ab4f6be6f1f29e4d37887f9eda", "tree": "5b3fc23d58e987c696619bb85358bdf9aa9dabc1", "parents": [ "7e3aa1f8629765fa856d9a5c869ec715da520507", "d0f6db485e6e2d1b33df462bd399005c88b5f5b2" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Wed Oct 10 09:25:06 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 10 09:25:06 2018 -0700" }, "message": "Compile caliper target against core_current am: 03996baab8\nam: d0f6db485e\n\nChange-Id: I14880638fdfb968b11be595d83f1ad28fae7f2eb\n" }, { "commit": "d0f6db485e6e2d1b33df462bd399005c88b5f5b2", "tree": "5b3fc23d58e987c696619bb85358bdf9aa9dabc1", "parents": [ "b4eabc79090118eab459db6137460404d23c07bf", "03996baab81fdf5da22babea6180462dd2c9aeb5" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Wed Oct 10 09:16:02 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 10 09:16:02 2018 -0700" }, "message": "Compile caliper target against core_current\nam: 03996baab8\n\nChange-Id: I3299f4ada0920f4d151d6f3b29a039cc79f6c206\n" }, { "commit": "03996baab81fdf5da22babea6180462dd2c9aeb5", "tree": "5b3fc23d58e987c696619bb85358bdf9aa9dabc1", "parents": [ "b2679aeb307c7193ebff544c11ceede8d73e0ccb" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Wed Oct 10 15:30:52 2018 +0100" }, "committer": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Wed Oct 10 15:33:18 2018 +0100" }, "message": "Compile caliper target against core_current\n\nThis will make it easier to switch some of its dependents\nover to using \"core Java APIs\". e.g. conscrypt-benchmarks.\nThe library doesn\u0027t actually need any Android packages\nto build.\n\nBug: 113148576\nTest: build\nChange-Id: I70fe48e0484c14d1d39ac5590eea662058b4d02c\n" }, { "commit": "2077eddc6d5aaa0512ef834683ba8bf6ff6d0d59", "tree": "810f9a15ceef20299414b0c606daf674b719e22a", "parents": [ "17c14d896b2261cc27b0fc8c27f690f05903b32d", "7e3aa1f8629765fa856d9a5c869ec715da520507" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Sep 13 17:51:01 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 13 17:51:01 2018 -0700" }, "message": "Convert external/caliper to Android.bp am: b2679aeb30 am: b4eabc7909\nam: 7e3aa1f862\n\nChange-Id: Ib13476818a80b99b126a7e4616d681519777ed44\n" }, { "commit": "7e3aa1f8629765fa856d9a5c869ec715da520507", "tree": "810f9a15ceef20299414b0c606daf674b719e22a", "parents": [ "a832464f59a84433669fa67ebefdfc18ae158186", "b4eabc79090118eab459db6137460404d23c07bf" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Sep 13 17:41:57 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 13 17:41:57 2018 -0700" }, "message": "Convert external/caliper to Android.bp am: b2679aeb30\nam: b4eabc7909\n\nChange-Id: I551ef9354753dc8461b56a078896735e4f02214a\n" }, { "commit": "b4eabc79090118eab459db6137460404d23c07bf", "tree": "810f9a15ceef20299414b0c606daf674b719e22a", "parents": [ "39208bfcf5ea33d8bdfa0be93985550a562f0573", "b2679aeb307c7193ebff544c11ceede8d73e0ccb" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Sep 13 17:24:20 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 13 17:24:20 2018 -0700" }, "message": "Convert external/caliper to Android.bp\nam: b2679aeb30\n\nChange-Id: Ia3b8903d60348d8261eab5fea1821d43d5848569\n" }, { "commit": "b2679aeb307c7193ebff544c11ceede8d73e0ccb", "tree": "810f9a15ceef20299414b0c606daf674b719e22a", "parents": [ "1e38b09f0bf5bcd092a31cdf3d27f9208fa1368b" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Sep 11 22:39:33 2018 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Sep 13 14:06:36 2018 +0000" }, "message": "Convert external/caliper to Android.bp\n\nSee build/soong/README.md for more information.\n\nTest: m checkbuild\nChange-Id: I998d9397e4eca3df0aff44d16e37a20a461f9a32\n" }, { "commit": "17c14d896b2261cc27b0fc8c27f690f05903b32d", "tree": "5ef6eb5b004616c8e9899847cfb9f4a593403b03", "parents": [ "fa661c07b4a72f85708391ad26fbc29349ff1e71", "a832464f59a84433669fa67ebefdfc18ae158186" ], "author": { "name": "Haibo Huang", "email": "hhb@google.com", "time": "Tue Sep 11 04:12:13 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 11 04:12:13 2018 -0700" }, "message": "Correct METADATA am: 1e38b09f0b am: 39208bfcf5\nam: a832464f59\n\nChange-Id: I9f8ae687eb5f5d47217140ad37f7c038c4896de2\n" }, { "commit": "a832464f59a84433669fa67ebefdfc18ae158186", "tree": "5ef6eb5b004616c8e9899847cfb9f4a593403b03", "parents": [ "000821e508d59061177acc67e9bdb3ebf5d47694", "39208bfcf5ea33d8bdfa0be93985550a562f0573" ], "author": { "name": "Haibo Huang", "email": "hhb@google.com", "time": "Tue Sep 11 04:07:27 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 11 04:07:27 2018 -0700" }, "message": "Correct METADATA am: 1e38b09f0b\nam: 39208bfcf5\n\nChange-Id: I4244da76cf98846edde363b4ef455ade2d95847e\n" }, { "commit": "39208bfcf5ea33d8bdfa0be93985550a562f0573", "tree": "5ef6eb5b004616c8e9899847cfb9f4a593403b03", "parents": [ "000821e508d59061177acc67e9bdb3ebf5d47694", "1e38b09f0bf5bcd092a31cdf3d27f9208fa1368b" ], "author": { "name": "Haibo Huang", "email": "hhb@google.com", "time": "Tue Sep 11 04:03:39 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 11 04:03:39 2018 -0700" }, "message": "Correct METADATA\nam: 1e38b09f0b\n\nChange-Id: I0a713953ae8b19af5b52c4fa0f36637eb1d3c874\n" }, { "commit": "1e38b09f0bf5bcd092a31cdf3d27f9208fa1368b", "tree": "5ef6eb5b004616c8e9899847cfb9f4a593403b03", "parents": [ "9a6777b973f78370a8aeed5d2953320fc887732f" ], "author": { "name": "Haibo Huang", "email": "hhb@google.com", "time": "Mon Sep 10 14:48:28 2018 -0700" }, "committer": { "name": "Haibo Huang", "email": "hhb@google.com", "time": "Mon Sep 10 14:48:28 2018 -0700" }, "message": "Correct METADATA\n\ncaliper is not updated by \u0027git merge\u0027. With git upstream set, updater\ntool will try to run `git merge-base` and get an error.\n\nThis changes the url to a github archive. So that the tool will get\nlatest SHA from github and compare.\n\nTest: NA\nChange-Id: I090818668b954046833c36b40b84caef49929bae\n" }, { "commit": "fa661c07b4a72f85708391ad26fbc29349ff1e71", "tree": "f87095493fc007e632c97a257784f69670b550cb", "parents": [ "ab75cacdf76a3a519f4c53108a2576b6b2cf2f75", "000821e508d59061177acc67e9bdb3ebf5d47694" ], "author": { "name": "Haibo Huang", "email": "hhb@google.com", "time": "Wed Jun 27 15:54:19 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 27 15:54:19 2018 -0700" }, "message": "Add METADATA for caliper am: 0924626bc5 am: 9a6777b973\nam: 000821e508\n\nChange-Id: Ia08a4d0e6c303b765a4f3cda05d4acbda81819f2\n" }, { "commit": "000821e508d59061177acc67e9bdb3ebf5d47694", "tree": "f87095493fc007e632c97a257784f69670b550cb", "parents": [ "ab75cacdf76a3a519f4c53108a2576b6b2cf2f75", "9a6777b973f78370a8aeed5d2953320fc887732f" ], "author": { "name": "Haibo Huang", "email": "hhb@google.com", "time": "Wed Jun 27 15:43:14 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 27 15:43:14 2018 -0700" }, "message": "Add METADATA for caliper am: 0924626bc5\nam: 9a6777b973\n\nChange-Id: If2b1dfd1f7b8230812ac0e1a20c823935571bf49\n" }, { "commit": "9a6777b973f78370a8aeed5d2953320fc887732f", "tree": "f87095493fc007e632c97a257784f69670b550cb", "parents": [ "ab75cacdf76a3a519f4c53108a2576b6b2cf2f75", "0924626bc51e5a95ee137d3f325eafa65546bcd8" ], "author": { "name": "Haibo Huang", "email": "hhb@google.com", "time": "Wed Jun 27 15:39:13 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 27 15:39:13 2018 -0700" }, "message": "Add METADATA for caliper\nam: 0924626bc5\n\nChange-Id: If6c1f2fcdf93cd69134357f65d38c72d963554bc\n" }, { "commit": "0924626bc51e5a95ee137d3f325eafa65546bcd8", "tree": "f87095493fc007e632c97a257784f69670b550cb", "parents": [ "1c800fe10206aed2c6fab03fda8263841b585cc7" ], "author": { "name": "Haibo Huang", "email": "hhb@google.com", "time": "Tue Jun 26 12:11:25 2018 -0700" }, "committer": { "name": "Haibo Huang", "email": "hhb@google.com", "time": "Tue Jun 26 12:11:59 2018 -0700" }, "message": "Add METADATA for caliper\n\nTest: NA\nChange-Id: I0755761cae9e81fd1f3665dc69f9961dc4e70a5e\n" }, { "commit": "6c497e02a737a943486cf6d58e83c122c46eb321", "tree": "d3b49138cf248004d30ecc597685b2bedf9048f0", "parents": [ "6e6c481ab7de884ff5cbea6339465229e6f64f2f", "ab75cacdf76a3a519f4c53108a2576b6b2cf2f75" ], "author": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Sun Nov 19 08:32:43 2017 +0000" }, "committer": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Sun Nov 19 08:32:43 2017 +0000" }, "message": "Snap for 4459973 from ab75cacdf76a3a519f4c53108a2576b6b2cf2f75 to pi-release\n\nChange-Id: Ie7141a7f5f4feb49d28c8e0f52604cf4cf2d9cc1\n" } ], "next": "ab75cacdf76a3a519f4c53108a2576b6b2cf2f75" }