summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-10-26Merge "Fix errorprone warnings that should be errors" am: 908e39bb6c 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
933457343a am: 986d652261 Original change: https://android-review.googlesource.com/c/platform/external/xmp_toolkit/+/2256747 Change-Id: Ie0452580a6d8d14c00200fb5b8f20bed037dbe18 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: 908e39bb6c am: ↵android-u-beta-1-gplTreehugger Robot
933457343a Original change: https://android-review.googlesource.com/c/platform/external/xmp_toolkit/+/2256747 Change-Id: I2705809d511b5812f67346bc1acf7102d1e0a394 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: 908e39bb6cmain-16k-with-phonesTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/xmp_toolkit/+/2256747 Change-Id: I5dd63db697a298d7f8585e7e4d46411ad4fc2b69 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: I68a369c8e5393820b72e3e10b0e001de514cf7e8
2022-06-28[automerger skipped] DO NOT MERGE - Empty merge of ↵Xin Li
tm-dev-plus-aosp-without-vendor@8763363 am: b650e2d59b -s ours am: 2be860f219 -s ours am: 60f7c8812e -s ours am: 910ae73015 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/xmp_toolkit/+/19090036 Change-Id: If6e42587baf4f5584e4ae3e86b5376114b510c2e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28[automerger skipped] DO NOT MERGE - Empty merge of ↵Xin Li
tm-dev-plus-aosp-without-vendor@8763363 am: b650e2d59b -s ours am: 2be860f219 -s ours am: 60f7c8812e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/xmp_toolkit/+/19090036 Change-Id: I721f1ae9cfe65016e2c5b813a4b3e3f3da2cbec4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28[automerger skipped] DO NOT MERGE - Empty merge of ↵Xin Li
tm-dev-plus-aosp-without-vendor@8763363 am: b650e2d59b -s ours am: 2be860f219 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/xmp_toolkit/+/19090036 Change-Id: Ia7b5fc3ea852695d8803efcfdf99ff02fcb27ebc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28[automerger skipped] DO NOT MERGE - Empty merge of ↵Xin Li
tm-dev-plus-aosp-without-vendor@8763363 am: b650e2d59b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/xmp_toolkit/+/19090036 Change-Id: I14a46596ad140622e26baf6da0f8ae03f772afad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27DO NOT MERGE - Empty merge of tm-dev-plus-aosp-without-vendor@8763363Xin Li
Merged-In: I0d8d2b9434e1bd30215ff43aded93ef4894551b5 Change-Id: Icebbde03416169aedba0d38e5df277d296d68522
2022-06-24Merge "Modify xmp_toolkit library to make it host supported" am: d52f54a828 ↵Hamzeh Zawawy
am: ec4de7e5ae am: 3446b261f9 am: 26159a61f5 am: 2a5c0b3b08 Original change: https://android-review.googlesource.com/c/platform/external/xmp_toolkit/+/2135278 Change-Id: Id77c7d02ea50dc1d95a68a25bd022b59dbe26323 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24Merge "Modify xmp_toolkit library to make it host supported" am: d52f54a828 ↵Hamzeh Zawawy
am: ec4de7e5ae am: 3446b261f9 am: 26159a61f5 Original change: https://android-review.googlesource.com/c/platform/external/xmp_toolkit/+/2135278 Change-Id: Ib89abd284579714f1244c2eafe897ce63602e1b2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24Merge "Modify xmp_toolkit library to make it host supported" am: d52f54a828 ↵Hamzeh Zawawy
am: ec4de7e5ae am: 3446b261f9 Original change: https://android-review.googlesource.com/c/platform/external/xmp_toolkit/+/2135278 Change-Id: I4f8582e52a7c8d29d86150535d73723afb2a422d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24Merge "Modify xmp_toolkit library to make it host supported" am: d52f54a828 ↵Hamzeh Zawawy
am: ec4de7e5ae Original change: https://android-review.googlesource.com/c/platform/external/xmp_toolkit/+/2135278 Change-Id: Ie40c1b7e9014258359336a3058c7502b1249c533 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24Merge "Modify xmp_toolkit library to make it host supported" am: d52f54a828Hamzeh Zawawy
Original change: https://android-review.googlesource.com/c/platform/external/xmp_toolkit/+/2135278 Change-Id: Ifd5b36963d0cdb9daa5637c0b667246ba01ad13f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24Merge "Modify xmp_toolkit library to make it host supported"Hamzeh Zawawy
2022-06-23Modify xmp_toolkit library to make it host supportedhamzeh
Test: m xmp_toolkit Change-Id: Ida90be0dda6c4f8c95bc2c2e73cb6e3b1042d80a
2021-07-27Merge "Update sdk_version to current" am: 0ff0ca4776 am: f64d6180aa 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_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_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
506e312377 am: 78bb454361 Original change: https://android-review.googlesource.com/c/platform/external/xmp_toolkit/+/1778286 Change-Id: If5b1fe6443be1459f6f46e58d3c614330b65ceb5
2021-07-27Merge "Update sdk_version to current" am: 0ff0ca4776 am: f64d6180aa am: ↵Treehugger Robot
506e312377 Original change: https://android-review.googlesource.com/c/platform/external/xmp_toolkit/+/1778286 Change-Id: Ibc5b59bf907eeaacc30c6a5af71ee27120d37653
2021-07-27Merge "Update sdk_version to current" am: 0ff0ca4776 am: f64d6180aaandroid-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-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/xmp_toolkit/+/1778286 Change-Id: I69f3c7cafb2977c27e365ab5576721610962a9bb
2021-07-27Merge "Update sdk_version to current" am: 0ff0ca4776Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/xmp_toolkit/+/1778286 Change-Id: I092fc4cc906fbae920ce02ecbcf50dcfbc7c96cb
2021-07-27Merge "Update sdk_version to current"android-s-beta-5android-s-beta-5Treehugger Robot
2021-07-26Update sdk_version to currentInseob Kim
It seems that there are no apparent reasons to keep version 8. This can help cut unnecessary dependency to prebuilts/sdk/8. Bug: 188068953 Test: build Change-Id: I0d8d2b9434e1bd30215ff43aded93ef4894551b5
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: Ib6603d89db5e419861bed98f92be64df3df34abd
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/xmp_toolkit" am: 3d7bad05be ↵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-releaseBob Badour
am: 03d2008cd5 am: 5fc991ad5c am: 5235cd2fcb Original change: https://android-review.googlesource.com/c/platform/external/xmp_toolkit/+/1576066 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iad02250589b53b697c9ffe221aae10859f846fdf
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/xmp_toolkit" am: 3d7bad05be ↵Bob Badour
am: 03d2008cd5 am: 5fc991ad5c am: 5235cd2fcb Original change: https://android-review.googlesource.com/c/platform/external/xmp_toolkit/+/1576066 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I071be0cde6031553f4aab8a30b6fb1dec8a862f7
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/xmp_toolkit" am: 3d7bad05be ↵android-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-releaseBob Badour
am: 03d2008cd5 am: 5fc991ad5c Original change: https://android-review.googlesource.com/c/platform/external/xmp_toolkit/+/1576066 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6c29abf5178e3f3acd690211c5d9b7a4ad91362b
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/xmp_toolkit" am: 3d7bad05be ↵Bob Badour
am: 03d2008cd5 Original change: https://android-review.googlesource.com/c/platform/external/xmp_toolkit/+/1576066 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iafc1e5e61d365d2a77793df9240b639895ab2f67
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/xmp_toolkit" am: 3d7bad05beandroid-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/xmp_toolkit/+/1576066 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6a527694faf101e3e0265cf1ba32a79e0d88b4b3
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/xmp_toolkit"android-s-preview-1Bob Badour
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/xmp_toolkitBob Badour
Added SPDX-license-identifier-BSD to: XMPCore/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I7cef2e382440902f6783da7651d29b5d6676ebec
2020-04-29Merge "Add METADATA to xmp_toolkit: BSD=NOTICE" am: 49ee24c5ed am: ↵Treehugger Robot
4eafdf35a1 am: ec3751d9c1 am: adc1980092 am: 8f37475aa1 Change-Id: Ia2dc00e389cc96029e86975ab06b93ad4794f855
2020-04-29Merge "Add METADATA to xmp_toolkit: BSD=NOTICE" am: 49ee24c5ed am: ↵Treehugger Robot
4eafdf35a1 am: ec3751d9c1 am: adc1980092 Change-Id: I78efbef283c278c8228ac83cec7a7bc5c81a15a6
2020-04-29Merge "Add METADATA to xmp_toolkit: BSD=NOTICE" am: 49ee24c5ed am: ↵Treehugger Robot
4eafdf35a1 am: ec3751d9c1 Change-Id: I8062010e743df8ab4ae2dc0f2a7f782509b7b440
2020-04-29Merge "Add METADATA to xmp_toolkit: BSD=NOTICE" am: 49ee24c5ed am: 4eafdf35a1Treehugger Robot
Change-Id: If7b84d70c364f25195f7246642bf96591ad2efb9
2020-04-29Merge "Add METADATA to xmp_toolkit: BSD=NOTICE" am: 49ee24c5edandroid-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: Ib11c901f0f3639b317ef6ba477505a91ddf0e4e6
2020-04-29Merge "Add METADATA to xmp_toolkit: BSD=NOTICE"Treehugger Robot
2020-04-28Add METADATA to xmp_toolkit: BSD=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I212c67a8a57cb5480c49d2ac870b0896029cf8e1
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterr_aml_301500702q_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-vts-11.0_r9android-vts-11.0_r8android-vts-11.0_r7android-vts-11.0_r6android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r16android-vts-11.0_r15android-vts-11.0_r14android-vts-11.0_r13android-vts-11.0_r12android-vts-11.0_r11android-vts-11.0_r10android-vts-11.0_r1android-security-11.0.0_r76android-security-11.0.0_r75android-security-11.0.0_r74android-security-11.0.0_r73android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-security-11.0.0_r1android-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-platform-11.0.0_r9android-platform-11.0.0_r8android-platform-11.0.0_r7android-platform-11.0.0_r6android-platform-11.0.0_r5android-platform-11.0.0_r40android-platform-11.0.0_r4android-platform-11.0.0_r39android-platform-11.0.0_r38android-platform-11.0.0_r37android-platform-11.0.0_r36android-platform-11.0.0_r35android-platform-11.0.0_r34android-platform-11.0.0_r33android-platform-11.0.0_r32android-platform-11.0.0_r31android-platform-11.0.0_r30android-platform-11.0.0_r3android-platform-11.0.0_r29android-platform-11.0.0_r28android-platform-11.0.0_r27android-platform-11.0.0_r26android-platform-11.0.0_r25android-platform-11.0.0_r24android-platform-11.0.0_r23android-platform-11.0.0_r22android-platform-11.0.0_r21android-platform-11.0.0_r20android-platform-11.0.0_r2android-platform-11.0.0_r19android-platform-11.0.0_r18android-platform-11.0.0_r17android-platform-11.0.0_r16android-platform-11.0.0_r15android-platform-11.0.0_r14android-platform-11.0.0_r13android-platform-11.0.0_r12android-platform-11.0.0_r11android-platform-11.0.0_r10android-platform-11.0.0_r1android-mainline-12.0.0_r55android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-mainline-10.0.0_r9android-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11android-mainline-10.0.0_r10android-cts-11.0_r9android-cts-11.0_r8android-cts-11.0_r7android-cts-11.0_r6android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r16android-cts-11.0_r15android-cts-11.0_r14android-cts-11.0_r13android-cts-11.0_r12android-cts-11.0_r11android-cts-11.0_r10android-cts-11.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r6android-11.0.0_r5android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r4android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r3android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r25android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r2android-11.0.0_r19android-11.0.0_r18android-11.0.0_r17android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android-11.0.0_r1android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12q_tzdata_aml_297100000ndk-sysroot-r21android12-mainline-tzdata-releaseandroid11-tests-releaseandroid11-security-releaseandroid11-s1-releaseandroid11-releaseandroid11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-platform-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-gsiandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseandroid10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid10-android13-mainline-tzdata-releaseXin Li
am: 05d51ce80f -s ours am skip reason: subject contains skip directive Change-Id: I62926f0bae93f905132caacfe7b2c41054a443c8
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li
Bug: 120848293 Change-Id: Ia84b64c1dd85578e9bd6446071ffff2101a8d128
2019-01-15Merge "Add default code reviewers into OWNERS" am: 3c6a252191 am: 407bf1e8f2Chih-hung Hsieh
am: 108594a37b Change-Id: I27459c39f179d93470fc6859b927ffeb969b6a63
2019-01-15Merge "Add default code reviewers into OWNERS" am: 3c6a252191Chih-hung Hsieh
am: 407bf1e8f2 Change-Id: I8ea1d7242b23e1fa5e368b6959b8e66dc00d5713
2019-01-15Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
am: 3c6a252191 Change-Id: Ib780cb3afe840a0cd3425949c73115a9e7bdd1fe
2019-01-15Merge "Add default code reviewers into OWNERS"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseChih-hung Hsieh
2019-01-15Add default code reviewers into OWNERSChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: Ibd76647e99517b35f803e81aa947e0d67672dfcd
2019-01-15Merge "Convert Android.mk file to Android.bp" am: 9d9163f90c am: 5bdef0eb24Sasha Smundak
am: 10d08a85a3 Change-Id: I35426b52a29c30c9a1b425a52625ec88f480b953
2019-01-15Merge "Convert Android.mk file to Android.bp" am: 9d9163f90cSasha Smundak
am: 5bdef0eb24 Change-Id: I74b1f02f9f2874772a0317fc7f828fa363800237
2019-01-15Merge "Convert Android.mk file to Android.bp"Sasha Smundak
am: 9d9163f90c Change-Id: If8ba2cfee6308a3d536adbb6f10dabc77abefaa3
2019-01-15Merge "Convert Android.mk file to Android.bp"Treehugger Robot
2019-01-14Convert Android.mk file to Android.bpSasha Smundak
See build/soong/README.md for more information. Change-Id: If257398b6db65edb07b0b2ffbe22d81de794f172 Fixes: 122332790 Test: treehugger
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 12:16:46 +0000