aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-11-29Merge "Delete `package-lock.json`" into main am: 7511d23c93 am: 7258fc59b1 ↵HEADmastermainHector Dearman
am: fc121af517 Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/2850985 Change-Id: I0f81a2c3d11205ba34c26867953b069813a961e6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29Merge "Delete `package-lock.json`" into main am: 7511d23c93 am: ca1d33fb28 ↵Hector Dearman
am: 0ece7233ea Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/2850985 Change-Id: I55d194a78c0c956c214b3cfeb4c4977e8651073a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Merge "Delete `package-lock.json`" into main am: 7511d23c93 am: 7258fc59b1Hector Dearman
Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/2850985 Change-Id: I9595222eee1172d54a9163c0edae33b1254cf776 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Merge "Delete `package-lock.json`" into main am: 7511d23c93 am: ca1d33fb28Hector Dearman
Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/2850985 Change-Id: I12562df8322f94c27d62f7e849a6e8c0a29f5bff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Merge "Delete `package-lock.json`" into main am: 7511d23c93Hector Dearman
Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/2850985 Change-Id: If476922d5b0de73f7502ce80e54e028b3297359d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Merge "Delete `package-lock.json`" into main am: 7511d23c93Hector Dearman
Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/2850985 Change-Id: I045f44124ba864ca5ff62e92220163a228c9b667 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Merge "Delete `package-lock.json`" into mainHector Dearman
2023-11-28Delete `package-lock.json`Hector Dearman
It's unused (the script call `npm install` not `npm ci` and so ignores the lock file) and now causing ~spurious issues from package vulnerability scanners. Bug: b/312505248#comment7 Change-Id: I3ecdf2f223160e9235280647d3f7343549c5d52d
2023-11-16Merge "Remove unused Android.mk files in chromium-trace" into main am: ↵Treehugger Robot
0db17ff248 am: 2f07721b3d am: 29fca143c3 Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/2825993 Change-Id: I32d0e30d3b84519aaaafc94ff15e34659a0f5ffa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16Merge "Remove unused Android.mk files in chromium-trace" into main am: ↵Treehugger Robot
0db17ff248 am: 5c05ca3dfb am: 796ba5246e Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/2825993 Change-Id: I496ac38da9ee08ccc2f2c1890e98bec430491661 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16Merge "Remove unused Android.mk files in chromium-trace" into main am: ↵Treehugger Robot
0db17ff248 am: 2f07721b3d Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/2825993 Change-Id: Ifd61bfcf4db4d012a7fc848cdff873f17db98f23 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16Merge "Remove unused Android.mk files in chromium-trace" into main am: ↵Treehugger Robot
0db17ff248 am: 5c05ca3dfb Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/2825993 Change-Id: I79cf9dc24db651500118b26cea6a2b3a9ff369ab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16Merge "Remove unused Android.mk files in chromium-trace" into main am: ↵Treehugger Robot
0db17ff248 Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/2825993 Change-Id: I7218cfb302f14797ca9c17c421aeb4f073ef24de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16Merge "Remove unused Android.mk files in chromium-trace" into main am: ↵Treehugger Robot
0db17ff248 Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/2825993 Change-Id: If96e3380ad52ed5de0fef4886edcfb6dd46b12ba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16Merge "Remove unused Android.mk files in chromium-trace" into mainTreehugger Robot
2023-11-13Remove unused Android.mk files in chromium-traceJim Tang
Bug: 309745873 Test: m Change-Id: Ic84122e6935714fac9e582583c5fa5384e690e14
2022-07-18Merge "Remove unused systrace-sdk-zip build rule" am: 2cb26420f8 am: ↵android-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_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devTreehugger Robot
dd9cae507b am: eec4b036b6 am: c72cb3370a am: c53609924f Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/2156196 Change-Id: I27bb01787fb98cf857f3d2ebe10f1bdcd01ead94 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-18Merge "Remove unused systrace-sdk-zip build rule" am: 2cb26420f8 am: ↵android-u-beta-1-gplmain-16k-with-phonesTreehugger Robot
dd9cae507b am: eec4b036b6 am: c72cb3370a Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/2156196 Change-Id: I43070d91e029dbeb6739a4d8608560caedb82700 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-18Merge "Remove unused systrace-sdk-zip build rule" am: 2cb26420f8 am: ↵Treehugger Robot
dd9cae507b am: eec4b036b6 Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/2156196 Change-Id: Icee81f50c67de9b0cf6b257d0fd73dc38871e901 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-18Merge "Remove unused systrace-sdk-zip build rule" am: 2cb26420f8 am: dd9cae507bTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/2156196 Change-Id: Ia995052e7dc8250d43c2c6bb6d80fcaaad26573a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-18Merge "Remove unused systrace-sdk-zip build rule" am: 2cb26420f8main-16kTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/2156196 Change-Id: If39bdceb01784d058e61940ec086ee168e71a6f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-18Merge "Remove unused systrace-sdk-zip build rule"Treehugger Robot
2022-07-16Remove unused systrace-sdk-zip build ruleDan Willemsen
The user was removed in https://android-review.googlesource.com/c/platform/development/+/1914938/ Bug: 197867654 Change-Id: Ic4edf96238710a57edf18b0bbb9bdc7a32ee90d6
2021-10-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/chromium-trace" am: ↵t_frc_odp_330442040t_frc_odp_330442000t_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_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_ase_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-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-odp-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_332714010Treehugger Robot
ada3e06eea am: 523509c328 am: f3bb1d37a6 am: 200c9c28a7 am: 100977eeda Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1865915 Change-Id: Ibd467e7f069e161892388b873e8bdf384d5e4f08
2021-10-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/chromium-trace" am: ↵Treehugger Robot
ada3e06eea am: 523509c328 am: f3bb1d37a6 am: 200c9c28a7 Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1865915 Change-Id: I83834d567710f399b6238c2a15eaa4f49de65636
2021-10-20Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/chromium-trace" am: ↵Treehugger Robot
ada3e06eea am: 523509c328 am: f3bb1d37a6 Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1865915 Change-Id: Ia7ae12c18e833a708819c6c3d0b93f8a6d81186e
2021-10-20Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/chromium-trace" am: ↵Treehugger Robot
ada3e06eea am: 523509c328 Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1865915 Change-Id: I3816b9d986a3590275433533e9f54951a48ef29b
2021-10-20Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/chromium-trace" am: ada3e06eeaandroid-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1865915 Change-Id: I4e5c7cfbbdeff8c9efbef3969ceaade6b41d4bef
2021-10-20Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/chromium-trace"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Treehugger Robot
2021-10-20[LSC] Add LOCAL_LICENSE_KINDS to external/chromium-traceBob Badour
Added legacy_restricted to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Change-Id: I547668bab82227dd2bf838f8f687e5719055396b
2021-10-15Merge "Add Android.bp to expose files for platform-tools sdk-repo build" am: ↵Treehugger Robot
f3cab41d9a am: ef54a2a1ef am: c85b47e881 am: 4a153ab3e7 am: b033bf67c7 Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1827443 Change-Id: I6006cd3554660d0a893c4ed5a4a9f8348634d83e
2021-10-15Merge "Add Android.bp to expose files for platform-tools sdk-repo build" am: ↵Treehugger Robot
f3cab41d9a am: ef54a2a1ef am: c85b47e881 am: 4a153ab3e7 Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1827443 Change-Id: Ib60a818c9c259086bb5cf7cddcbd5cdffce1bca1
2021-10-15Merge "Add Android.bp to expose files for platform-tools sdk-repo build" am: ↵Treehugger Robot
f3cab41d9a am: ef54a2a1ef am: c85b47e881 Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1827443 Change-Id: Icbb82e687db2887ea4598cb2d70398cb39b24ae8
2021-10-15Merge "Add Android.bp to expose files for platform-tools sdk-repo build" am: ↵Treehugger Robot
f3cab41d9a am: ef54a2a1ef Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1827443 Change-Id: I54c4d1daa545e836434789a061bcd00798a55f14
2021-10-15Merge "Add Android.bp to expose files for platform-tools sdk-repo build" am: ↵Treehugger Robot
f3cab41d9a Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1827443 Change-Id: Ie036c2835fcd6aa79bc3b33d981b5de7ae8ced91
2021-10-15Merge "Add Android.bp to expose files for platform-tools sdk-repo build"Treehugger Robot
2021-10-12Add Android.bp to expose files for platform-tools sdk-repo buildDan Willemsen
Bug: 187222815 Change-Id: I762186d51e749c5fd25c4f07c875e4d080fbf063
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I7bb99a34072dbe43d7752971a3da8199e0a51aec
2021-05-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/chromium-trace" am: ↵Treehugger Robot
9e8dcdbd01 am: 9b991a4f5a am: b2966fd428 am: 138ade68f9 am: 86b42a6cd0 Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1682245 Change-Id: I32071687b854cc52ce49286736c0a4ed7e18bc26
2021-05-17Merge changes I195c394b,Iff693cf6 am: b101eec5e1 am: d5085cc096 am: ↵Treehugger Robot
19f3aab438 am: ef2f29d2b3 am: f579e8f3f2 Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1677030 Change-Id: I2a22bd216231dfb722e35d13f5c18f5b39563599
2021-05-17[automerger skipped] Update scripts to specify python2 am: 25821f7b19 am: ↵John Reck
a534c20c58 am: f83016a5b1 -s ours am: 7765787e58 -s ours am: 1f6d83531e -s ours am skip reason: Merged-In Iff693cf656a9bbdcf7960d8beb4626315e7af57f with SHA-1 cbd49e760a is already in history Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1677029 Change-Id: I41ce4b9c1a2c5a8ce7aa16fe74d44ed9eb0c5597
2021-05-16Update scripts to specify python2 am: cbd49e760a am: 4b5623a394John Reck
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/chromium-trace/+/14186041 Change-Id: I6f039ce7600b8e4888abfe52d8dab67ee05fcf9b
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/chromium-trace" am: ↵android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-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_r12android12L-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-releaseTreehugger Robot
9e8dcdbd01 am: 9b991a4f5a am: b2966fd428 am: 138ade68f9 Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1682245 Change-Id: I1a386496b4eeaeb846ff6f2c535228b314f15568
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/chromium-trace" 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
9e8dcdbd01 am: 9b991a4f5a am: b2966fd428 am: 138ade68f9 Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1682245 Change-Id: Ibcecd1d39d109110c688555156051f17396583c7
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/chromium-trace" am: ↵Treehugger Robot
9e8dcdbd01 am: 9b991a4f5a am: b2966fd428 am: 138ade68f9 Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1682245 Change-Id: Ie9caf5a4e5c3a3064116970d679cc7c8605fe1ab
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/chromium-trace" am: ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-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-devandroid12-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-devTreehugger Robot
9e8dcdbd01 am: 9b991a4f5a am: b2966fd428 Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1682245 Change-Id: Iafc1c71000b1ac6f0f85560d10c63a3a14046be2
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/chromium-trace" am: ↵Treehugger Robot
9e8dcdbd01 am: 9b991a4f5a Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1682245 Change-Id: I6f0d46d0ae923a817865a724c250c9e3c84fea77
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/chromium-trace" am: 9e8dcdbd01android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1682245 Change-Id: I28dcc74aced2954e05450ce10bd16287e369bf19
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/chromium-trace"android-s-beta-2android-s-beta-1Treehugger Robot
2021-04-20[LSC] Add LOCAL_LICENSE_KINDS to external/chromium-traceBob Badour
Added SPDX-license-identifier-BSD to: catapult/systrace/atrace_helper/jni/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ie2aee809ae717dd9c4d8c40c4d288f3115372acd