summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-10-16Merge "Snap for 10957012 from 6d7f987710eebdcc6b7b0180f50eb65086f06dd7 to ↵simpleperf-releaseAndroid Build Coastguard Worker
simpleperf-release" into simpleperf-release
2023-10-16Snap for 10957012 from 6d7f987710eebdcc6b7b0180f50eb65086f06dd7 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: Ie3536ba19fd6d5b6d604a239c248df31d939b3c6
2023-03-15Merge "Snap for 9751898 from face98089f3e645dd47f9cf0ffcc98593a8b7f63 to ↵Android Build Coastguard Worker
simpleperf-release" into simpleperf-release
2023-03-15Snap for 9751898 from face98089f3e645dd47f9cf0ffcc98593a8b7f63 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: Id0036ca8b216831a2037c13754a6817e73e09129
2023-02-24Merge "Snap for 9652768 from 3e4a4d8819dd8816d061879733c4c367b5a91ce7 to ↵Android Build Coastguard Worker
simpleperf-release" into simpleperf-release
2023-02-24Snap for 9652768 from 3e4a4d8819dd8816d061879733c4c367b5a91ce7 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I60df18a67e0d60d7ea5d6340b5100b7803a5f958
2022-12-02Merge "Snap for 9363649 from 665bcf82200c4506bbb27a5bb58e9b0f8174cdea to ↵Android Build Coastguard Worker
simpleperf-release" into simpleperf-release
2022-12-02Snap for 9363649 from 665bcf82200c4506bbb27a5bb58e9b0f8174cdea to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I3da06d553f906bd4e32574c93fb23b6adab3e560
2022-10-26Merge "Fix errorprone warnings that should be errors" am: 665bcf8220 am: ↵HEADandroid-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000mastermainandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseTreehugger Robot
3e4a4d8819 am: face98089f Original change: https://android-review.googlesource.com/c/platform/external/emma/+/2254821 Change-Id: I9e808d48cb73236e6c08a8962aaf8ad31ad69510 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26Merge "Fix errorprone warnings that should be errors" am: 665bcf8220 am: ↵android-u-beta-1-gplTreehugger Robot
3e4a4d8819 Original change: https://android-review.googlesource.com/c/platform/external/emma/+/2254821 Change-Id: I87137bed382173acde27afec975a8bd029621ef3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26Merge "Fix errorprone warnings that should be errors" am: 665bcf8220main-16k-with-phonesTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/emma/+/2254821 Change-Id: I77f57cb9ff7b14c59f57b870d2b3a696cb024660 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26Merge "Fix errorprone warnings that should be errors"Treehugger Robot
2022-10-15Fix errorprone warnings that should be errorsCole Faust
This commit is part of a large scale change to fix errorprone errors that have been downgraded to warnings in the android source tree, so that they can be promoted to errors again. The full list of changes include the following, but not all will be present in any one individual commit: BadAnnotationImplementation BadShiftAmount BanJNDI BoxedPrimitiveEquality ComparableType ComplexBooleanConstant CollectionToArraySafeParameter ConditionalExpressionNumericPromotion DangerousLiteralNull DoubleBraceInitialization DurationFrom DurationTemporalUnit EmptyTopLevelDeclaration EqualsNull EqualsReference FormatString FromTemporalAccessor GetClassOnAnnotation GetClassOnClass HashtableContains IdentityBinaryExpression IdentityHashMapBoxing InstantTemporalUnit InvalidTimeZoneID InvalidZoneId IsInstanceIncompatibleType JUnitParameterMethodNotFound LockOnBoxedPrimitive MathRoundIntLong MislabeledAndroidString MisusedDayOfYear MissingSuperCall MisusedWeekYear ModifyingCollectionWithItself NoCanIgnoreReturnValueOnClasses NonRuntimeAnnotation NullableOnContainingClass NullTernary OverridesJavaxInjectableMethod ParcelableCreator PeriodFrom PreconditionsInvalidPlaceholder ProtoBuilderReturnValueIgnored ProtoFieldNullComparison RandomModInteger RectIntersectReturnValueIgnored ReturnValueIgnored SelfAssignment SelfComparison SelfEquals SizeGreaterThanOrEqualsZero StringBuilderInitWithChar TreeToString TryFailThrowable UnnecessaryCheckNotNull UnusedCollectionModifiedInPlace XorPower See https://errorprone.info/bugpatterns for more information on the checks. Bug: 253827323 Test: m RUN_ERROR_PRONE=true javac-check Change-Id: I130ad8168b9df8925375cb1f0ff2ab9925c06f9e
2022-09-02Merge "Snap for 9023430 from 2c93c0f074a941ceedafe4c1fc101518237f6ce9 to ↵Android Build Coastguard Worker
simpleperf-release" into simpleperf-release
2022-09-02Snap for 9023430 from 2c93c0f074a941ceedafe4c1fc101518237f6ce9 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I4c38df3d9807f6146c28a364de9a9a4193643a89
2022-06-30Merge "Downgrade SuspiciousIndentation lint to a warning" am: 38dc415e0a am: ↵Treehugger Robot
2c93c0f074 am: 871f1e1a15 am: 59e1971153 am: 10fe0bd90c Original change: https://android-review.googlesource.com/c/platform/external/emma/+/2141373 Change-Id: I3bb4b0c994cbfa104267ada8f10eb409cc2085a6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30Merge "Downgrade SuspiciousIndentation lint to a warning" am: 38dc415e0a am: ↵Treehugger Robot
2c93c0f074 am: 871f1e1a15 am: 59e1971153 Original change: https://android-review.googlesource.com/c/platform/external/emma/+/2141373 Change-Id: Icadd33bcab4b9c30df5064ad22b53a0b48c2cf06 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30Merge "Downgrade SuspiciousIndentation lint to a warning" am: 38dc415e0a am: ↵Treehugger Robot
2c93c0f074 am: 871f1e1a15 Original change: https://android-review.googlesource.com/c/platform/external/emma/+/2141373 Change-Id: Id240514756d56e59f1972a32af342433651fd91d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30Merge "Downgrade SuspiciousIndentation lint to a warning" am: 38dc415e0a am: ↵Treehugger Robot
2c93c0f074 Original change: https://android-review.googlesource.com/c/platform/external/emma/+/2141373 Change-Id: I0205efda0f676fae861980317ab83b363505dfde Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30Merge "Downgrade SuspiciousIndentation lint to a warning" am: 38dc415e0aTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/emma/+/2141373 Change-Id: I82cf68e869c2dcedcc099dde93fbee5011974913 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30Merge "Downgrade SuspiciousIndentation lint to a warning"Treehugger Robot
2022-06-29Downgrade SuspiciousIndentation lint to a warningCole Faust
Bug: 236431222 Test: Presubmits Change-Id: I1bfcfe2d24c995b4e93c4a0881a784e4e5a99f17
2021-10-12Merge "Snap for 7817384 from c494b31689e7b442df42084f1209c9f51b9e1734 to ↵Android Build Coastguard Worker
simpleperf-release" into simpleperf-release
2021-10-12Snap for 7817384 from c494b31689e7b442df42084f1209c9f51b9e1734 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: If7b4bbcd8b165f6404c1b26006bf5df9ba8e14ee
2021-06-02Merge sc-mainline-prodt_frc_tz4_330443010t_frc_swc_330443040t_frc_swc_330443010t_frc_sta_330443010t_frc_sch_330443040t_frc_sch_330443010t_frc_res_330443000t_frc_per_330444010t_frc_odp_330442040t_frc_odp_330442000t_frc_neu_330443030t_frc_neu_330443000t_frc_net_330443000t_frc_med_330443030t_frc_ips_330443010t_frc_ext_330443000t_frc_doc_330543000t_frc_doc_330443060t_frc_doc_330443000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_med_330913000aml_go_ips_330911000aml_go_ext_330912000aml_go_doc_330912000aml_go_con_330913000aml_go_cbr_330912000aml_go_ase_330913000aml_go_art_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-media-releaseandroid13-mainline-go-ipsec-releaseandroid13-mainline-go-extservices-releaseandroid13-mainline-go-documentsui-releaseandroid13-mainline-go-conscrypt-releaseandroid13-mainline-go-cellbroadcast-releaseandroid13-mainline-go-art-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-scheduling-releaseandroid13-frc-resolv-releaseandroid13-frc-permission-releaseandroid13-frc-os-statsd-releaseandroid13-frc-odp-releaseandroid13-frc-neuralnetworks-releaseandroid13-frc-networking-releaseandroid13-frc-media-swcodec-releaseandroid13-frc-media-releaseandroid13-frc-ipsec-releaseandroid13-frc-extservices-releaseandroid13-frc-documentsui-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010Xin Li
Bug: 189946434 Change-Id: I9e3cf03e7e6b97026ca90b4389a4c8fe55894993
2021-03-15Merge "Snap for 7209783 from 4db15808110b0a6130173308e5e3e704478709b6 to ↵android-build-prod (mdb)
simpleperf-release" into simpleperf-release
2021-03-15Snap for 7209783 from 4db15808110b0a6130173308e5e3e704478709b6 to ↵android-build-prod (mdb)
simpleperf-release Change-Id: Id7c308ea5af3c3f9eec567b588c9b065c7799518
2021-02-24Merge "Snap for 7168215 from e5d33e7993db8f19e53bca607ec4a23405b45c8e to ↵android-build-prod (mdb)
simpleperf-release" into simpleperf-release
2021-02-24Snap for 7168215 from e5d33e7993db8f19e53bca607ec4a23405b45c8e to ↵android-build-prod (mdb)
simpleperf-release Change-Id: If77ae5a71635a4dc733f89ddc66b12ef25970a4d
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/emma" am: e5d33e7993 am: ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseTreehugger Robot
4db1580811 am: 8388997b2c am: c494b31689 Original change: https://android-review.googlesource.com/c/platform/external/emma/+/1588825 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id64b214343db1856b33814fef78a30934399a79d
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/emma" am: e5d33e7993 am: ↵Treehugger Robot
4db1580811 am: 8388997b2c am: c494b31689 Original change: https://android-review.googlesource.com/c/platform/external/emma/+/1588825 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6977a84701ac8c2926e504c048cf0e33bfd14ab3
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/emma" am: e5d33e7993 am: ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Treehugger Robot
4db1580811 am: 8388997b2c Original change: https://android-review.googlesource.com/c/platform/external/emma/+/1588825 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6ee7e9a6d63cb0b0cfe91aecacb98fb3fd299f14
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/emma" am: e5d33e7993 am: ↵Treehugger Robot
4db1580811 Original change: https://android-review.googlesource.com/c/platform/external/emma/+/1588825 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1f56a7cc8c0efda6cb49f23c68a6f95077187151
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/emma" am: e5d33e7993android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/emma/+/1588825 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7dfa66d27acab79158b82cdcf310d6e01a8fc805
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/emma"android-s-preview-1Treehugger Robot
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/emmaBob Badour
Added SPDX-license-identifier-CPL-1.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I1b7109ff183849f3c852d81080a0383dfc904d6c
2021-02-01Merge "Snap for 7116807 from 0a24b8d22dccac2277ff3b73c7d01ae44fc0711f to ↵android-build-prod (mdb)
simpleperf-release" into simpleperf-release
2021-02-01Snap for 7116807 from 0a24b8d22dccac2277ff3b73c7d01ae44fc0711f to ↵android-build-prod (mdb)
simpleperf-release Change-Id: Ib6faa6f918277218714021c626748d94789e7a85
2021-01-24Merge "Fix license_type. Licensed under CPL" am: 0a24b8d22d am: 2b76c2af77 ↵Bob Badour
am: 7e7a7adbb6 Original change: https://android-review.googlesource.com/c/platform/external/emma/+/1556387 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibfddf969774d66785576dc037ff39ba32becefc6
2021-01-23Merge "Fix license_type. Licensed under CPL" am: 0a24b8d22d am: 2b76c2af77Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/emma/+/1556387 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8cd5c9bbaa169d9b09f04c2cd57b5827f27951d1
2021-01-23Merge "Fix license_type. Licensed under CPL" am: 0a24b8d22dBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/emma/+/1556387 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib11fbb6cecb6513fb023e8df655246585df42a6f
2021-01-23Merge "Fix license_type. Licensed under CPL"Bob Badour
2021-01-21Fix license_type. Licensed under CPLBob Badour
See: http://go/android-license-checking-v2-lsc Test: m all Bug: 151953481 Bug: 151177513 Bug: 67772237 Change-Id: If8f1285f85d244be12a9e7de5fea42c30f40f238
2020-11-30Merge "Snap for 7002008 from e2df7953673aea077d8554c8ac25c3bea3aaaf66 to ↵android-build-prod (mdb)
simpleperf-release" into simpleperf-release
2020-11-30Snap for 7002008 from e2df7953673aea077d8554c8ac25c3bea3aaaf66 to ↵android-build-prod (mdb)
simpleperf-release Change-Id: Ie36068dbd4d35f625672f50daf0516e7f3a685d0
2020-09-17Merge "Snap for 6844436 from 5962900c171f2d8abae61c0586d8dd79674236dc to ↵android-build-prod (mdb)
simpleperf-release" into simpleperf-release
2020-09-17Snap for 6844436 from 5962900c171f2d8abae61c0586d8dd79674236dc to ↵android-build-prod (mdb)
simpleperf-release Change-Id: I62c21115901043f843f687b20b9cbea9a4d5bdec
2020-06-10Merge "Snap for 6577974 from 6e14649fb4b4eed576870ce5feddf881d6cd109d to ↵android-build-prod (mdb)
simpleperf-release" into simpleperf-release
2020-06-10Snap for 6577974 from 6e14649fb4b4eed576870ce5feddf881d6cd109d to ↵android-build-prod (mdb)
simpleperf-release Change-Id: I69b11df5fe7438d1626b48beb219e3ec97b0129a
2020-04-29Merge "Add METADATA to emma: Apache2=NOTICE" am: 5ba3fe719b am: 6e14649fb4 ↵Treehugger Robot
am: 5962900c17 am: e2df795367 am: 8af348770f Change-Id: I2e1721b4dd5ea7eed04cf38d64219d9f8ed8cc30
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 23:54:50 +0000