summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-01-26Fix license texts. am: 0f1e4c0309 am: 0ec63194dc am: 26c5703de6 am: 511ce8f8f5HEADt_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-u-beta-1-gplandroid-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_r16android-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_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_sch_341510000aml_sch_331113000aml_sch_331111000aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_odp_341610000aml_net_341610030aml_net_341510050aml_net_341510000aml_net_341411030aml_net_341311010aml_net_341310020aml_net_341014000aml_net_340913000aml_net_331910030aml_net_331812010aml_net_331710000aml_net_331610000aml_net_331412000aml_net_331313030aml_net_331313010aml_net_331110020aml_net_331011030aml_net_330910010aml_net_330811010aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_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_cfg_341510000aml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_art_341615020aml_art_341514450aml_art_341514410aml_art_341411300aml_art_341311100aml_art_341110110aml_art_341110060aml_art_341010050aml_art_340915060aml_art_331813100aml_art_331813010aml_art_331711080aml_art_331612010aml_art_331413030aml_art_331314010aml_art_331113000aml_art_331012050aml_ads_341615050aml_ads_341517040aml_ads_341413000aml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000mastermain-16k-with-phonesmain-16kmainandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-uwb-releaseandroid14-mainline-networking-releaseandroid14-mainline-healthfitness-releaseandroid14-mainline-art-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseandroid13-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-scheduling-releaseandroid13-mainline-networking-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-art-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_tz5_341510010aml_tz4_332714010Bob Badour
Original change: https://android-review.googlesource.com/c/platform/hardware/google/easel/+/1959710 Change-Id: Iaf7792c70fd0359239fe84b476e61081d3fadeda
2022-01-26Fix license texts. am: 0f1e4c0309 am: 0ec63194dc am: 26c5703de6Bob Badour
Original change: https://android-review.googlesource.com/c/platform/hardware/google/easel/+/1959710 Change-Id: Id2404b1657f0a168d470f797e028c2def18e1203
2022-01-26Fix license texts. am: 0f1e4c0309 am: 0ec63194dcBob Badour
Original change: https://android-review.googlesource.com/c/platform/hardware/google/easel/+/1959710 Change-Id: I3600d616c9ce6ea8ef3806d3383ed6d268605d33
2022-01-26Fix license texts. am: 0f1e4c0309Bob Badour
Original change: https://android-review.googlesource.com/c/platform/hardware/google/easel/+/1959710 Change-Id: I1fa5ac6a8c08442f1819a1e91d02ebe8ae51a1c3
2022-01-25Fix license texts.android-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-1Bob Badour
Project is entirely Android first-party code. Test: m nothing Change-Id: I4510ae3238e6064875aaecdcf1bc5153ceb6e604
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/google/easel am: 791c056dc2 am: ↵Bob Badour
2ebf52a786 am: 2c7ccca634 am: 857b61ecbb Original change: https://android-review.googlesource.com/c/platform/hardware/google/easel/+/1574718 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I73049ea502f5953c6fe083d1740ca520c6c41581
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/google/easel am: 791c056dc2 am: ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-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-devandroid-s-v2-preview-1Bob Badour
2ebf52a786 am: 2c7ccca634 Original change: https://android-review.googlesource.com/c/platform/hardware/google/easel/+/1574718 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iac2a78d94fcd44ccbc16bf138c7d186356a1a74b
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/google/easel am: 791c056dc2 am: ↵Bob Badour
2ebf52a786 Original change: https://android-review.googlesource.com/c/platform/hardware/google/easel/+/1574718 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I85bdf56eb901b7405db4fa17f1ddce2eb5dbd795
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/google/easel am: 791c056dc2android-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/hardware/google/easel/+/1574718 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I94febb20641d52bf821ef0116cb76becc50e2a75
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/google/easelandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp amber/camera/Android.bp amber/camera/libhdrplusclient/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I16a5e68b3d379fed343a8cc20e67c3ac4aabb48b
2020-05-05Add METADATA to easel: Apache2=NOTICE am: 359969941b am: 792d8b327c am: ↵Bob Badour
1eed59deec am: 29477a9abd am: 99e332d008 Change-Id: Ifabf94528ec3111c0fe69721269ff063a27563b9
2020-05-05Add METADATA to easel: Apache2=NOTICE am: 359969941b am: 792d8b327c am: ↵Bob Badour
1eed59deec am: 29477a9abd Change-Id: I7138cc62b8203383487dd528af538aa1b54a4e67
2020-05-05Add METADATA to easel: Apache2=NOTICE am: 359969941b am: 792d8b327c am: ↵Bob Badour
1eed59deec Change-Id: I94ffe01b877a6033d8937c4376893efb24eb5651
2020-05-05Add METADATA to easel: Apache2=NOTICE am: 359969941b am: 792d8b327cBob Badour
Change-Id: I906bccc4dd9d0ffc8f8981f00bc0c3e551d5e98a
2020-05-05Add METADATA to easel: Apache2=NOTICE am: 359969941bandroid-r-beta-3android-r-beta-2Bob Badour
Change-Id: Ia79c4a7ce7a43f07583116ba814de83e7a676177
2020-05-01Add METADATA to easel: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I82078a360c2d1f10d68923614e4e28f365ffea20
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: e79a2d9093 -s ours am: adaa5c2408 am: f7af0172ba am: 354b3165cf -s ours am skip reason: subject contains skip directive Change-Id: I80aab0954c0fc7d07e28bd23111f5c28fd120147
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: e79a2d9093 -s ours am: adaa5c2408 am: f7af0172ba Change-Id: I801d27e70e9dfe7c683f36afa2564a0158f91264
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: e79a2d9093 -s ours am: adaa5c2408 Change-Id: I036b6fe82628c426ccc4cb5eb14d3091345999d5
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: e79a2d9093 -s ours am skip reason: subject contains skip directive Change-Id: I541d9a00deccade98275be0d1685fb22bb2ec4c8
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: Icc260e86f22b2d00d0beb263bbe73a33c0591bae
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 3f3743bee0 -s ours am: fed166aea9 am: 5570c7e8d7 am: 11c00a4c8f -s ours am skip reason: subject contains skip directive Change-Id: I5f8498b863cb96db87d7ab881f6f577c371fc1c0
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 3f3743bee0 -s ours am: fed166aea9 am: 5570c7e8d7 Change-Id: I61f3a42e829de40c0c21c6f26367a1efbb573b20
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 3f3743bee0 -s ours am: fed166aea9 Change-Id: Ic1198a4ad23833ad2a6db34979bcce0e8bc0a904
2020-03-19DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li
stag-aosp-master am: 3f3743bee0 Change-Id: I9f304442019c5d0295c85402acfa4d2d9aa59ab9
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 3f3743bee0 -s ours am skip reason: subject contains skip directive Change-Id: Ib4750250bf3231eaf715ae12b22fc5199d579ff2
2020-03-18DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I3afd5c19df86397ca5515f8f9da06d186be15aaf
2020-02-03vendor/google_easel has been removed in downstream branches am: 04a9552904 ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-12.0.0_r112android-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-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-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_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_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-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_r10aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-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-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-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseaml_tz2_305400100Automerger Merge Worker
am: c0289b1ada am: 097a7710c9 Change-Id: I3fdc6a07425c604530a208bcf08e8a9b09f708cb
2020-02-03vendor/google_easel has been removed in downstream branches am: 04a9552904 ↵Automerger Merge Worker
am: c0289b1ada Change-Id: Ibd63a20da1a3c07e900b4a5317ae9a92e50ab112
2020-02-03vendor/google_easel has been removed in downstream branches am: 04a9552904android-r-preview-4android-r-preview-3android-r-preview-2Automerger Merge Worker
Change-Id: I1c30be84791f554d95a9bc7eeaaef15d0fef28ca
2020-02-03vendor/google_easel has been removed in downstream branchesandroid-r-preview-1Dan Willemsen
Fixes: 148658703 Test: m libhdrplusclient on aosp and internal master Change-Id: Ic6b62c3f83d54204faa2f063ecec0e7cce9912fc
2019-12-04Merge Android10 QPR1 into AOSP master am: af8a319569 am: 9a65750022Automerger Merge Worker
Change-Id: Idfd7b25987e6e1df2323b0141f08e8fb0e9a3768
2019-12-04Merge Android10 QPR1 into AOSP master am: af8a319569Xin Li
am: 13b6f89e32 Change-Id: I33975f17640c1089ece7da38d2832f2d798056fe
2019-12-03Merge Android10 QPR1 into AOSP masterXin Li
am: af8a319569 Change-Id: I008f460e64dbdf21397e393cb52c619b1e55f686
2019-12-02Merge Android10 QPR1 into AOSP masterXin Li
Bug: 145570283 Change-Id: I6672a23d4785ea876e0e2b74979c34883477344f
2019-10-31[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 42b79fa5bd am: aa4c4659d0 -s ours am skip reason: subject contains skip directive Change-Id: Ifaaa3d4316ceef7e569f84af9acb016066afb016
2019-10-31DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master am: 42b79fa5bd Change-Id: Ie88a7772bbb04399e4a72f692403de38c3c71639
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵temp_b_145570283Xin Li
stage-aosp-master Bug: 142003500 Change-Id: Ic8505c810f7711f882c7b4bc21632f391508a9ba
2019-08-21camera: Add thermal throttle callback am: 09df16c703Chien-Yu Chen
am: 0f11d42de3 Change-Id: I7cc54f2cfe235f91b2c8584322be45fda597472e
2019-08-21camera: Add thermal throttle callbackChien-Yu Chen
am: 09df16c703 Change-Id: Ie85ab101253d041cab07e53a558bbac8a6161558
2019-08-19camera: Add thermal throttle callbackandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-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_r30android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseandroid10-d4-s1-releaseandroid10-d4-releaseChien-Yu Chen
Test: Camera CTS Bug: 119872767 Change-Id: I9ab1fdc311f08dff28cf806b9556d2cdd2d2ead6
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12ndk-sysroot-r21android10-devandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li
am: 814643f017 -s ours am skip reason: subject contains skip directive Change-Id: I36a5430deda8eb80e24a0c6e6327b3699d908010
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: I17fbf82f23fe647c3b062f05d93c9bfd75ea5616
2018-12-10[automerger skipped] DO NOT MERGE am: d0e7fcebc4 -s ours am: 1fcf622c1d -s ↵Xin Li
ours am: ff05e0bc95 -s ours Change-Id: If12d366fc2da490391712f1408830c836f6e0946
2018-12-10[automerger skipped] DO NOT MERGE am: d0e7fcebc4 -s oursXin Li
am: 1fcf622c1d -s ours Change-Id: I6f2c158dc98303bd5ced350a8fa840cfdde82397
2018-12-10[automerger skipped] DO NOT MERGEXin Li
am: d0e7fcebc4 -s ours Change-Id: Id23a360e3d432a40fcd6275fb1f7230532c2f642
2018-12-07DO NOT MERGEandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseXin Li
Merge pie-platform-release (PPRL.181205.001, history only) into master Bug: 120502534 Change-Id: I87ba88f1d2475a9b517c7d1dbf8892db9274f9f9
2018-08-08Merge Android Pie into master am: 2d88c771f9 am: 6a504415fa am: bbe5109792Xin Li
am: e2418bbf07 Change-Id: I27aaa6ac136f3eb6a894dda53874e7a23d62f8c9
2018-08-07Merge Android Pie into master am: 2d88c771f9 am: 6a504415faXin Li
am: bbe5109792 Change-Id: Ic8eecee58d423024486f3eacd4bebaec8c5c8eda
2018-08-07Merge Android Pie into master am: 2d88c771f9android-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsXin Li
am: 6a504415fa Change-Id: Ieb093b0affb286d7a9fe14c31a54e610c799c415
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 20:07:44 +0000