summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-10-07[automerger skipped] Merge Android 14 am: ab50b9e997 -s ours am: aaf862bed1 ↵HEADmastermainXin Li
-s ours am: fd1379affb -s ours am: 898aa90c07 -s ours am: 48e237211e -s ours am skip reason: Merged-In I19543d1bf29083d24609aae1b02e6235d0d78843 with SHA-1 b0915ceae9 is already in history Original change: https://android-review.googlesource.com/c/platform/external/jsr330/+/2776020 Change-Id: Ia9b2c1c63c3188bfe2cb360d305410e39d35d894 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: ab50b9e997 -s ours am: aaf862bed1 ↵Xin Li
-s ours am: fd1379affb -s ours am: 898aa90c07 -s ours am skip reason: Merged-In I19543d1bf29083d24609aae1b02e6235d0d78843 with SHA-1 b0915ceae9 is already in history Original change: https://android-review.googlesource.com/c/platform/external/jsr330/+/2776020 Change-Id: I1c086e4d0ace50204ad5a39dac332cede4f0ed6d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: ab50b9e997 -s ours am: aaf862bed1 ↵Xin Li
-s ours am: fd1379affb -s ours am skip reason: Merged-In I19543d1bf29083d24609aae1b02e6235d0d78843 with SHA-1 b0915ceae9 is already in history Original change: https://android-review.googlesource.com/c/platform/external/jsr330/+/2776020 Change-Id: I092cf10db3d7c2e7913588a7a6fc61d82917f277 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: ab50b9e997 -s ours am: aaf862bed1 ↵Xin Li
-s ours am skip reason: Merged-In I19543d1bf29083d24609aae1b02e6235d0d78843 with SHA-1 b0915ceae9 is already in history Original change: https://android-review.googlesource.com/c/platform/external/jsr330/+/2776020 Change-Id: Ida8e8c4142de946ffd8a05510075c78535ab0fed Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: ab50b9e997 -s oursXin Li
am skip reason: Merged-In I19543d1bf29083d24609aae1b02e6235d0d78843 with SHA-1 b0915ceae9 is already in history Original change: https://android-review.googlesource.com/c/platform/external/jsr330/+/2776020 Change-Id: I31e504256635b327d3f85233844e5890da176383 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: I19543d1bf29083d24609aae1b02e6235d0d78843 Change-Id: Iaaeafb8cbe0c1d7d454d99a50616bd57ca440991
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 7317e9aed2 -s ours ↵Xin Li
am: 832fbe87e2 -s ours am: 29f6a8d4cb -s ours am: 7f93f2a284 -s ours am skip reason: Merged-In If240d22844ce47df705295965261537d13bb4654 with SHA-1 07e40c436f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/24182198 Change-Id: Ib0ec07c6857e805140ab9ffc8e637d7555d24169 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 7317e9aed2 -s ours ↵Xin Li
am: 832fbe87e2 -s ours am: 29f6a8d4cb -s ours am skip reason: Merged-In If240d22844ce47df705295965261537d13bb4654 with SHA-1 07e40c436f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/24182198 Change-Id: I14e501fe0eb187a8fd620c910c2afde698c3c8e4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 7317e9aed2 -s ours ↵Xin Li
am: 832fbe87e2 -s ours am skip reason: Merged-In If240d22844ce47df705295965261537d13bb4654 with SHA-1 07e40c436f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/24182198 Change-Id: Ia151334c6e3e44105c90464d6e956494b0db4446 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28[automerger skipped] Merge Android U (ab/10368041) am: 7317e9aed2 -s oursXin Li
am skip reason: Merged-In If240d22844ce47df705295965261537d13bb4654 with SHA-1 07e40c436f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/24182198 Change-Id: I07ddbdf9ba065a0872945da882084cb0ca2461d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14Merge Android U (ab/10368041)tmp_amf_298295554Xin Li
Bug: 291102124 Merged-In: If240d22844ce47df705295965261537d13bb4654 Change-Id: I954262114db9a75706a32b950372806bda82dd03
2023-02-19[automerger skipped] (TM-MP) Rb back compat: Base changes (go/rbc-design) ↵Neha Pattan
am: b0915ceae9 am: 07e40c436f am: 289689dc53 -s ours am skip reason: Merged-In Ia583fddcb88a21b5c739c7438c07967e7e581099 with SHA-1 103d5b5a62 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/21481657 Change-Id: Icde6d757448c5597870f33c134f90dd5f3da36cf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-19(TM-MP) Rb back compat: Base changes (go/rbc-design) am: b0915ceae9 am: ↵aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030android14-mainline-healthfitness-releaseNeha Pattan
07e40c436f Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/21481657 Change-Id: I080b142b8cca57b12da00922818ea78b541d236e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-19[automerger skipped] (TM-MP) Rb back compat: Base changes (go/rbc-design) ↵Neha Pattan
am: b0915ceae9 am: 07e40c436f -s ours am skip reason: Merged-In Ia583fddcb88a21b5c739c7438c07967e7e581099 with SHA-1 103d5b5a62 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/21481657 Change-Id: Ia6149e3d875f20fe8d1dc97ccd54d310e0b9f87e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17(TM-MP) Rb back compat: Base changes (go/rbc-design) am: b0915ceae9android-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_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-devNeha Pattan
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/21173774 Change-Id: If240d22844ce47df705295965261537d13bb4654 Merged-In: Ia583fddcb88a21b5c739c7438c07967e7e581099 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Bug: 263816046 Ignore-AOSP-First: Automerger fix
2023-02-17(TM-MP) Rb back compat: Base changes (go/rbc-design) 2p: b0915ceae9Neha Pattan
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/21173774 Bug: 263816046 Change-Id: Ia583fddcb88a21b5c739c7438c07967e7e581099
2023-02-14(TM-MP) Rb back compat: Base changes (go/rbc-design)Neha Pattan
Bug: 263816046 Test: manual Change-Id: I19543d1bf29083d24609aae1b02e6235d0d78843
2023-02-08Rename healthconnect to healthfitnessronish
Bug: 264516143 Change-Id: I4bc0fc62fc5cc8fb814dfa55a7809256e3f88792
2022-10-26Fix errorprone warnings that should be errors am: c9512961be am: ee43457366 ↵Cole Faust
am: 6cdab74e1b Original change: https://android-review.googlesource.com/c/platform/external/jsr330/+/2256802 Change-Id: I094907ccfdedec285085a50d788d5a6cd2ea9877 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26Fix errorprone warnings that should be errors am: c9512961be am: ee43457366android-u-beta-1-gplCole Faust
Original change: https://android-review.googlesource.com/c/platform/external/jsr330/+/2256802 Change-Id: Ide319774ef2b8c006d3dae3986de3c551381fce4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26Fix errorprone warnings that should be errors am: c9512961bemain-16k-with-phonesCole Faust
Original change: https://android-review.googlesource.com/c/platform/external/jsr330/+/2256802 Change-Id: Id7ffa7cc8f3f53f485a297faaca73809a7a8d220 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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: I2a63b9824b50305602617a1328290cab1ecd6341
2022-10-10Make jsr330 library available to Device Lock module.Amos Bianchi
Bug: b/241442337 Test: service successfully starts Test: atest DeviceLockUnitTests Test: cts-tradefed run cts -m CtsDeviceLockTestCases Change-Id: If65432348fb71e0df1408722d6933371a4d8d16b
2022-09-14Add healthConnectController in apex_avalilableMagdi
Test: m Bug: 246299481 Change-Id: Iac5d7ec1fd32e573e1b494269a504230baaf2f5a
2022-08-02[automerge] Add ondevicepersonalization in apex_available. 2p: 4c4aa48456Presubmit Automerger Backend
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/19487089 Bug: 241003305 Change-Id: I15a75acde57b8018df57513ce6a2c4a116dc2ec6
2022-08-02Add ondevicepersonalization in apex_available.Andrew Vuong
We need to build ondevicepersonalization with mdd in static_libs and it requires jsr330 add ondevicepersonalization to apex_available property Bug: 241003305 Test: mma Change-Id: Icfcfa2bee09e0c7e1931e5012da74087990071d6
2022-07-15[automerge] Add adservices in apex_availble. 2p: f6e74d82c1Hao Liu
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/19290774 Bug: 239230416 Change-Id: Ia2f7aefc12275e3a92c393d32b7fca1b021ab7a9
2022-07-15Add adservices in apex_availble.Hao Liu
We need to build adservices with mdd in static_libs and it requires jsr330 add adservices to apex_availble property. Bug: 239230416 Test: mma Change-Id: I5a8049e508cd4f9818dc304e4ae8042b85a6b831
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_330810010aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-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-go-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-releaseXin Li
Bug: 189946434 Change-Id: Ia785e81876f708250d38c81bb0702077a1a177e6
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/jsr330 am: b1df19de09 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-releaseBob Badour
4e4592a4ba am: dbda358af0 am: cddfcb8e6b Original change: https://android-review.googlesource.com/c/platform/external/jsr330/+/1588822 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I570384dc7790a63db1fc59a81652548201e409de
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/jsr330 am: b1df19de09 am: ↵Bob Badour
4e4592a4ba am: dbda358af0 am: cddfcb8e6b Original change: https://android-review.googlesource.com/c/platform/external/jsr330/+/1588822 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0956e1a775c55980625663c33d220f8086fccf24
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/jsr330 am: b1df19de09 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-1Bob Badour
4e4592a4ba am: dbda358af0 Original change: https://android-review.googlesource.com/c/platform/external/jsr330/+/1588822 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7beb191771105f47ed68c03c1f9db7e41c60cd79
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/jsr330 am: b1df19de09 am: 4e4592a4baBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/jsr330/+/1588822 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5b86cad370bedd78d634180ab7979671f94c168d
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/jsr330 am: b1df19de09android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/jsr330/+/1588822 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5f61d2dbcf23abf3011e9ebfd429966e02d13fde
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/jsr330android-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: If2dfc4ed083071258533eeaae7b11e0ff2db551e
2020-04-29Add METADATA to jsr330: Apache2=NOTICE am: ab8ad49b5e am: 5209aa2c7c am: ↵Bob Badour
eeb75971dc am: e5e54b3ae5 am: d15075f2ce Change-Id: If0f67c05ae570e16ff59198118b793fae8c571d3
2020-04-29Add METADATA to jsr330: Apache2=NOTICE am: ab8ad49b5e am: 5209aa2c7c am: ↵Bob Badour
eeb75971dc am: e5e54b3ae5 Change-Id: I8be0dbecc1ad2f0914a5e7f4ff76fdbcb94e824c
2020-04-29Add METADATA to jsr330: Apache2=NOTICE am: ab8ad49b5e am: 5209aa2c7c am: ↵Bob Badour
eeb75971dc Change-Id: I32b47f20075294f0fc7a191b78800944179e04ee
2020-04-29Add METADATA to jsr330: Apache2=NOTICE am: ab8ad49b5e am: 5209aa2c7cBob Badour
Change-Id: I362a946951ded14350be0271a7e9546f72dc7856
2020-04-29Add METADATA to jsr330: Apache2=NOTICE am: ab8ad49b5eandroid-r-beta-3android-r-beta-2Bob Badour
Change-Id: I7fffc107b3c81a396d50ddd638fb6c69a29c7277
2020-04-28Add METADATA to jsr330: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I6b6312a22bc47039338350cd8fb537343549b70f
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_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_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: 8638b2a449 -s ours am skip reason: subject contains skip directive Change-Id: Ieaf5a74d05186301aa3e99e9f077c70efd824839
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: I4f29d99b408119893b7a3be17bdb6ec263dbfb2d
2019-01-11Add default code reviewers into OWNERS am: 4e58e1dd1e am: 8e50ce832cChih-Hung Hsieh
am: 70d5e4861c Change-Id: Ibc67af49d0bff9a9d038de4990fffe467356a099
2019-01-11Add default code reviewers into OWNERS am: 4e58e1dd1eChih-Hung Hsieh
am: 8e50ce832c Change-Id: I545065cfa313199e15b7eb527bd1fcf4295ba4f3
2019-01-11Add default code reviewers into OWNERSChih-Hung Hsieh
am: 4e58e1dd1e Change-Id: I13af8507c054c06b0f9e498d93cc2c5048337ae6
2019-01-10Add default code reviewers into OWNERSandroid-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
Bug: 33166666 Test: gerrit uploader Change-Id: Ibac968261167d8cd34d5e01a71226aa47aecfb70
2018-12-10[automerger skipped] DO NOT MERGE am: c749ade438 -s ours am: 8b4eb7a907 -s ↵Xin Li
ours am: c90e8aad72 -s ours Change-Id: I0cc556d3aef2fa46bcc495b5cde45ffe171de866
2018-12-10[automerger skipped] DO NOT MERGE am: c749ade438 -s oursXin Li
am: 8b4eb7a907 -s ours Change-Id: Ia933fb4af29068053e3d6370de49ccbd6677c5f0
2018-12-10[automerger skipped] DO NOT MERGEXin Li
am: c749ade438 -s ours Change-Id: I3f0bd58588ae4d52e16b14a49a9ff869a156eaa7
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 14:07:50 +0000