aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-10-23Merge "Add partial support for dex containers (DEX v41)." into main am: ↵HEADmastermainDavid Srbecky
12595bf3a2 Original change: https://android-review.googlesource.com/c/platform/external/smali/+/2756247 Change-Id: I8de22e8374609252da6a69a4a9dd5d88e8bb595b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23Merge "Add partial support for dex containers (DEX v41)." into mainDavid Srbecky
2023-10-23Add partial support for dex containers (DEX v41).David Srbecky
Accept the new format as long as the container has just one dex file. Test: atest ClasspathFetcherTest Change-Id: Ie320fb1b1ab4e0af843b4377f184e17fc46dfa5a
2023-10-23Merge "Add smali OWNERS" into main am: fe46f25132Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/smali/+/2796102 Change-Id: I3f0399c2caec1f2fa3196c40fa192ea97d0d45b0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23Merge "Add smali OWNERS" into mainTreehugger Robot
2023-10-23Add smali OWNERSDavid Srbecky
Change-Id: I7fdd8cc512bf5a3e304471776c4e8b46f110e3d8
2022-10-27Merge "Fix errorprone warnings that should be errors" am: d8afb5196c 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
fb544ed5bb am: 7d1aba89de Original change: https://android-review.googlesource.com/c/platform/external/smali/+/2256782 Change-Id: I152b0a550fd812b1357eef31cc8c17c4189905c1 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: d8afb5196c am: ↵android-u-beta-1-gplTreehugger Robot
fb544ed5bb Original change: https://android-review.googlesource.com/c/platform/external/smali/+/2256782 Change-Id: Iebd56eaba5b44c10971943d466f5905c36799ee6 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: d8afb5196cmain-16k-with-phonesTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/smali/+/2256782 Change-Id: I3e6bed33758b0a5acbfd65798bb827908804ef49 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: Ib03e311818c39aabb42f4286fb44a210321c940a
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: Ia9bb12935e58bbca66dd0946fac2e903062848e9
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 0bd776e3c8 -s ↵Xin Li
ours am: ee7bd22dbc -s ours am: c4a6e21b80 -s ours am skip reason: Change-Id I143414d9e0010360f410d4ce416dea47a18081e6 with SHA-1 468689f430 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I715385eae8453ef80bca3b244ef41ca18c501d04
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 0bd776e3c8 -s ↵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-releaseXin Li
ours am: ee7bd22dbc -s ours am: c4a6e21b80 -s ours am skip reason: Change-Id I143414d9e0010360f410d4ce416dea47a18081e6 with SHA-1 468689f430 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I24c74a419a8aa9885ff330d0252a854e779b3f05
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 0bd776e3c8 -s ↵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-1Xin Li
ours am: ee7bd22dbc -s ours am skip reason: Change-Id I143414d9e0010360f410d4ce416dea47a18081e6 with SHA-1 468689f430 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0e0c61fd263e038d6ce70f40c68b6d766a44e7b9
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 0bd776e3c8 -s oursXin Li
am skip reason: Change-Id I143414d9e0010360f410d4ce416dea47a18081e6 with SHA-1 468689f430 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3187ddbc71f3bf3f1f73840529bc66d26246865e
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I143414d9e0010360f410d4ce416dea47a18081e6 Change-Id: I8ae4ae9b2f05ba0bcf43f2c66395e099005e1259
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/smali" am: 2acd19fe19 am: ↵Bob Badour
a4c146a439 am: 91678a6fa8 am: 46d0847187 Original change: https://android-review.googlesource.com/c/platform/external/smali/+/1588225 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iaf1bf221753a8f80ca7455bf242bf4a4b75bad51
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/smali" am: 2acd19fe19 am: ↵Bob Badour
a4c146a439 am: 91678a6fa8 am: 46d0847187 Original change: https://android-review.googlesource.com/c/platform/external/smali/+/1588225 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic45aa5649dafeed69e560bc8d84fb420c33c5a56
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/smali" am: 2acd19fe19 am: ↵Bob Badour
a4c146a439 am: 91678a6fa8 Original change: https://android-review.googlesource.com/c/platform/external/smali/+/1588225 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ida43372fa531a84dea9e3943fab4b4d0436a1099
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/smali" am: 2acd19fe19 am: ↵Bob Badour
a4c146a439 Original change: https://android-review.googlesource.com/c/platform/external/smali/+/1588225 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I107c5038a25e97b8c0fbbf7ed27a87a8f413be6c
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/smali" am: 2acd19fe19Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/smali/+/1588225 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I21d0d351e6db7d1db072075692b16d06223d2baa
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/smali"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/smaliBob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: Android.bp dexlib2/Android.bp Added SPDX-license-identifier-BSD to: baksmali/Android.bp deodexerant/Android.bp smali/Android.bp util/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ib54545fe7932e452016833d969b0d42d6b93f1f3
2020-11-25Mark ab/6881855 as merged am: 05d6038bcf am: 468689f430Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/smali/+/13112908 Change-Id: I0be1ed47728b947b982493128db29c9aefbb96b1
2020-11-25Mark ab/6881855 as merged am: 05d6038bcfXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/smali/+/13112908 Change-Id: I143414d9e0010360f410d4ce416dea47a18081e6
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I70a4e0e64d15b31ac367bba4678891a73db9daca
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 6f6c231fdf -s ours am: ↵Xin Li
c4f7b168ba -s ours am: a42c1e407d -s ours am skip reason: Change-Id I2547534d94a0d290f511604f190413ac9c9ba228 with SHA-1 e900a9011c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/smali/+/12795754 Change-Id: Iae3663671dcb34e9c8d20690289e2e88d6a99e51
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 6f6c231fdf -s ours am: ↵Xin Li
c4f7b168ba -s ours am skip reason: Change-Id I2547534d94a0d290f511604f190413ac9c9ba228 with SHA-1 e900a9011c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/smali/+/12795754 Change-Id: I34c46d9649f5030a4af0f22b08f74af8ce046fbf
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 6f6c231fdf -s oursXin Li
am skip reason: Change-Id I2547534d94a0d290f511604f190413ac9c9ba228 with SHA-1 e900a9011c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/smali/+/12795754 Change-Id: Ib291b9f9e476480ee37c4f1ebe5ea68ef461d0a5
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I2547534d94a0d290f511604f190413ac9c9ba228 Change-Id: I639290e8ee2369dabf46e2f74341face63cc9d48
2020-09-11[automerger skipped] Merge "Merge Android R" am: 33984eb6fa -s ours am: ↵Xin Li
678ba27ac5 -s ours am: bc0c49f047 -s ours am: 7dec9f153b -s ours am: 2e4bc6f1ce -s ours am skip reason: Change-Id I31dca54f3abc68de303bdfed6727112688e2f228 with SHA-1 9f6624c411 is in history Original change: https://android-review.googlesource.com/c/platform/external/smali/+/1422362 Change-Id: Ibd66bbba780a25d558fc6a87ab6a450d5e73ecdb
2020-09-11[automerger skipped] Merge "Merge Android R" am: 33984eb6fa -s ours am: ↵Xin Li
678ba27ac5 -s ours am: bc0c49f047 -s ours am: 7dec9f153b -s ours am skip reason: Change-Id I31dca54f3abc68de303bdfed6727112688e2f228 with SHA-1 9f6624c411 is in history Original change: https://android-review.googlesource.com/c/platform/external/smali/+/1422362 Change-Id: I4e3e3c71503aa5a8b02b246bbfb20fbd2ec7d06d
2020-09-11[automerger skipped] Merge "Merge Android R" am: 33984eb6fa -s ours am: ↵Xin Li
678ba27ac5 -s ours am: bc0c49f047 -s ours am skip reason: Change-Id I31dca54f3abc68de303bdfed6727112688e2f228 with SHA-1 9f6624c411 is in history Original change: https://android-review.googlesource.com/c/platform/external/smali/+/1422362 Change-Id: Ia1911609ce5cebd3c759243f179ea0473860349a
2020-09-11[automerger skipped] Merge "Merge Android R" am: 33984eb6fa -s ours am: ↵Xin Li
678ba27ac5 -s ours am skip reason: Change-Id I31dca54f3abc68de303bdfed6727112688e2f228 with SHA-1 9f6624c411 is in history Original change: https://android-review.googlesource.com/c/platform/external/smali/+/1422362 Change-Id: I5bcecf856bc4ad1ee0adb1b627c276e96ee1dbb3
2020-09-11[automerger skipped] Merge "Merge Android R" am: 33984eb6fa -s oursXin Li
am skip reason: Change-Id I31dca54f3abc68de303bdfed6727112688e2f228 with SHA-1 9f6624c411 is in history Original change: https://android-review.googlesource.com/c/platform/external/smali/+/1422362 Change-Id: I99df055568154aa0c70555a63f743fdeec4cb478
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I31dca54f3abc68de303bdfed6727112688e2f228 Change-Id: I1f7bc67e665d4c4c13f1db07e409da444ebb3e70
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 9f6624c411 -s ours am: eee6b33ac4 -s ours am: 212102a6eb -s ours am: a09f483f30 -s ours am skip reason: Change-Id Ifa05e30dabc9da3b5ecd25138b04da5fb196f475 with SHA-1 b6add02184 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/smali/+/12470076 Change-Id: Id5687918f2d40b2bea55ccaf50b291577443c268
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 9f6624c411 -s ours am: eee6b33ac4 -s ours am: 212102a6eb -s ours am skip reason: Change-Id Ifa05e30dabc9da3b5ecd25138b04da5fb196f475 with SHA-1 b6add02184 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/smali/+/12470076 Change-Id: I02ea76546c2cb86560647c38006aa7ccb20e6840
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 9f6624c411 -s ours am: eee6b33ac4 -s ours am skip reason: Change-Id Ifa05e30dabc9da3b5ecd25138b04da5fb196f475 with SHA-1 b6add02184 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/smali/+/12470076 Change-Id: I981778f30a1ac1cbe099475002bf9dd13ddf3328
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 9f6624c411 -s ours am skip reason: Change-Id Ifa05e30dabc9da3b5ecd25138b04da5fb196f475 with SHA-1 b6add02184 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/smali/+/12470076 Change-Id: I02fbdb76ffe0a9a69a9920d3b318e2596a9a72ab
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: Ifa05e30dabc9da3b5ecd25138b04da5fb196f475 Change-Id: I31dca54f3abc68de303bdfed6727112688e2f228
2020-05-01Add dexlib target that doesn't bundle commons-cli am: 9b3c02f8d1 am: ↵Andrei Onea
ea36b09549 am: aff0371ad4 am: 9f64794313 am: c7e9ef7417 Change-Id: Iafc13e409d7dddefc275b9f1071fbc057908058d
2020-05-01Add dexlib target that doesn't bundle commons-cli am: 9b3c02f8d1 am: ↵Andrei Onea
ea36b09549 am: e900a9011c am: 8851f4f535 Change-Id: I47fa44fc098508c8db535d0a0d6e67588ab5674f
2020-05-01Add dexlib target that doesn't bundle commons-cli am: 9b3c02f8d1 am: ↵Andrei Onea
ea36b09549 am: aff0371ad4 am: 9f64794313 Change-Id: Ie1821c9d3de9a49d3a15a3beee54bbc12e29bdf7
2020-05-01Add dexlib target that doesn't bundle commons-cli am: 9b3c02f8d1 am: ↵Andrei Onea
b6add02184 am: 1f1f72ce6d am: d7a2f5d25b Change-Id: I8a669bc720b4a4a89ed8c0510fa82944dbd9c092
2020-05-01Add dexlib target that doesn't bundle commons-cli am: 9b3c02f8d1 am: ↵Andrei Onea
ea36b09549 am: aff0371ad4 Change-Id: I58135d3fe2f2095e7d2d2cad1e3494339b80b762
2020-05-01Add dexlib target that doesn't bundle commons-cli am: 9b3c02f8d1 am: ↵Andrei Onea
ea36b09549 am: e900a9011c Change-Id: I694f8e2fc0c918b216bd5632e37de19217453d98
2020-05-01Add dexlib target that doesn't bundle commons-cli am: 9b3c02f8d1 am: ↵Andrei Onea
b6add02184 am: 1f1f72ce6d Change-Id: Iea7e72758851234fd3673d73e270f87e534b6369
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 13:17:34 +0000