summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-10-08[automerger skipped] Merge Android 12 am: e50d84f657 -s ours am: abee3c07bf ↵t_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_330444000frc_340821000frc_340819280frc_340819220frc_340819190frc_340819030frc_340819020frc_340819010frc_340818170frc_340818110android-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-u-beta-1-gplandroid-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-security-14.0.0_r1android-platform-14.0.0_r1android-platform-13.0.0_r1android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-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_r4android-14.0.0_r39android-14.0.0_r38android-14.0.0_r3android-14.0.0_r28android-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_r2android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r12android-14.0.0_r11android-14.0.0_r10android-14.0.0_r1android-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_331131000main-16k-with-phonesmain-16kandroid14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-platform-releaseandroid14-mainline-uwb-releaseandroid14-mainline-networking-releaseandroid14-mainline-healthfitness-releaseandroid14-mainline-art-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-releaseandroid14-gsiandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseandroid14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-releaseandroid14-d1-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-platform-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_332714010Xin Li
-s ours am: 493b1834ae -s ours am: c7d339e1b1 -s ours am: 2c3eace0d5 -s ours am skip reason: Merged-In I73d64334d80989a28d24d4528122c754d6b653e9 with SHA-1 a048cbce4b is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/1847671 Change-Id: I5ed4321368d2173496fce4ad68e463343b0f3769
2021-10-08[automerger skipped] Merge Android 12 am: e50d84f657 -s ours am: abee3c07bf ↵Xin Li
-s ours am: 493b1834ae -s ours am: c7d339e1b1 -s ours am skip reason: Merged-In I73d64334d80989a28d24d4528122c754d6b653e9 with SHA-1 a048cbce4b is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/1847671 Change-Id: Ia36469eb649c1f40398c5ab00a3e11d45ad14416
2021-10-08[automerger skipped] Merge Android 12 am: e50d84f657 -s ours am: abee3c07bf ↵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-1Xin Li
-s ours am: 493b1834ae -s ours am skip reason: Merged-In I73d64334d80989a28d24d4528122c754d6b653e9 with SHA-1 a048cbce4b is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/1847671 Change-Id: Iba60e1cbb0ff72eafb38b96ad7d219f959ae4717
2021-10-08[automerger skipped] Merge Android 12 am: e50d84f657 -s ours am: abee3c07bf ↵Xin Li
-s ours am skip reason: Merged-In I73d64334d80989a28d24d4528122c754d6b653e9 with SHA-1 a048cbce4b is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/1847671 Change-Id: Idca72ab9b31d4fdfb24ffd190fd5c1979dab3878
2021-10-08[automerger skipped] Merge Android 12 am: e50d84f657 -s oursXin Li
am skip reason: Merged-In I73d64334d80989a28d24d4528122c754d6b653e9 with SHA-1 a048cbce4b is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/1847671 Change-Id: If416e389ded2483b6cd379cb988d2f841b0b92df
2021-10-06Merge Android 12android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
Bug: 202323961 Merged-In: I73d64334d80989a28d24d4528122c754d6b653e9 Change-Id: I9607dafca2998fbb4edd74afa1d418c05e8041b3
2021-09-13[automerger skipped] Update compilesdk version of UniversalMediaPlayer am: ↵Aurimas Liutikas
a048cbce4b -s ours am: 0a84baaada -s ours am: 5b60077720 -s ours am: 104752ad3e -s ours am skip reason: Merged-In I73d64334d80989a28d24d4528122c754d6b653e9 with SHA-1 48fecafc2f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/15799324 Change-Id: Ibcf0af5d5db9d6517df1f04026b1bfe68c9cd271
2021-09-13[automerger skipped] Update compilesdk version of UniversalMediaPlayer am: ↵Aurimas Liutikas
a048cbce4b -s ours am: 0a84baaada -s ours am: 5b60077720 -s ours am skip reason: Merged-In I73d64334d80989a28d24d4528122c754d6b653e9 with SHA-1 48fecafc2f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/15799324 Change-Id: Id0c5180a49b82d903bd0724127f639e217a97cac
2021-09-13[automerger skipped] Update compilesdk version of UniversalMediaPlayer am: ↵Aurimas Liutikas
a048cbce4b -s ours am: 0a84baaada -s ours am skip reason: Merged-In I73d64334d80989a28d24d4528122c754d6b653e9 with SHA-1 48fecafc2f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/15799324 Change-Id: Ib12c84714cd66dc8d6745a5f54bd1c53e105d3ff
2021-09-13[automerger skipped] Update compilesdk version of UniversalMediaPlayer am: ↵Aurimas Liutikas
a048cbce4b -s ours am skip reason: Merged-In I73d64334d80989a28d24d4528122c754d6b653e9 with SHA-1 48fecafc2f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/15799324 Change-Id: Idf453125599832ee1bd429b346620d53c01b31e6
2021-09-09[automerger skipped] Update compilesdk version of UniversalMediaPlayer am: ↵Aurimas Liutikas
48fecafc2f am: adb7a606a5 am: 8b28d3b639 -s ours am skip reason: Merged-In I73d64334d80989a28d24d4528122c754d6b653e9 with SHA-1 f8b6d271fb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/15689901 Change-Id: I263daef16a37a5d7f06e39a379de2fd4f164ebb8
2021-09-09Update compilesdk version of UniversalMediaPlayer am: 48fecafc2f am: adb7a606a5Aurimas Liutikas
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/15689901 Change-Id: Ie30faf7a8181585cc8c19190f095782664164ea9
2021-09-09Update compilesdk version of UniversalMediaPlayer am: 48fecafc2fAurimas Liutikas
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/15689901 Change-Id: I0ec3ffbc76ab86c5152670f6077cc6edf45600a9
2021-09-09Update compilesdk version of UniversalMediaPlayertemp_sam_202323961Aurimas Liutikas
Test: make UniversalMediaPlayer Change-Id: I73d64334d80989a28d24d4528122c754d6b653e9 Merged-In: I73d64334d80989a28d24d4528122c754d6b653e9 (cherry picked from commit f8b6d271fbf07c23f671c6b3a3387dbf385d4db1)
2021-08-26Update compilesdk version of UniversalMediaPlayerAurimas Liutikas
Test: make UniversalMediaPlayer Change-Id: I73d64334d80989a28d24d4528122c754d6b653e9 Merged-In: I73d64334d80989a28d24d4528122c754d6b653e9 (cherry picked from commit f8b6d271fbf07c23f671c6b3a3387dbf385d4db1)
2021-08-20Update compilesdk version of UniversalMediaPlayerAurimas Liutikas
Test: make UniversalMediaPlayer Change-Id: I73d64334d80989a28d24d4528122c754d6b653e9
2021-02-21[automerger skipped] Mark ab/7061308 as merged in stage. am: 17d6decd38 -s ↵Xin Li
ours am: 7191b8312e -s ours am: 3a912bc775 -s ours am skip reason: Change-Id I46d52b31f5a20aa4e3247b2948e3288d841271a8 with SHA-1 7adc6657fa is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1095d463217ed521dbab2acadcd1d6937e9d6720
2021-02-21[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/UniversalMediaPlayer am: ↵Bob Badour
64ee5ed017 am: 2aaa8b391b am: 82e7d607a8 am: 1af17a9df7 Original change: https://android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/1587897 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I54ee4592048ef476c3bf0bd821d3319cc9d81030
2021-02-21[automerger skipped] Mark ab/7061308 as merged in stage. am: 17d6decd38 -s ↵android-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-devXin Li
ours am: 7191b8312e -s ours am skip reason: Change-Id I46d52b31f5a20aa4e3247b2948e3288d841271a8 with SHA-1 7adc6657fa is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib46353a1bf0d59fe3f7f0cd6186f846465505d16
2021-02-21[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/UniversalMediaPlayer am: ↵Bob Badour
64ee5ed017 am: 2aaa8b391b am: 82e7d607a8 Original change: https://android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/1587897 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If0b5cd8e4db6b44c060297bce01d810969acb05e
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 17d6decd38 -s oursXin Li
am skip reason: Change-Id I46d52b31f5a20aa4e3247b2948e3288d841271a8 with SHA-1 7adc6657fa is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idada2493966a8608e28571ae6f1ae46188bdff89
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: I46d52b31f5a20aa4e3247b2948e3288d841271a8 Change-Id: I99b79b8c63f83f3062bbcbaa6cc5af6ab1dfa9a5
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/UniversalMediaPlayer am: ↵Bob Badour
64ee5ed017 am: 2aaa8b391b Original change: https://android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/1587897 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I19536673157aa583d02bb52f5d4b09f7ef5de74f
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/UniversalMediaPlayer am: ↵Bob Badour
64ee5ed017 Original change: https://android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/1587897 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1f6b8679cb3e24b45d33e1f2a12bf93dfede7463
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/UniversalMediaPlayerBob 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: I53f5caa63fe0d1d25444a7bd453e3433865aaf2f
2020-12-15Remove akersten from OWNERS am: b978aa3d67 am: e4e0ebfa95 am: 7adc6657fanchalko
Original change: https://android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/1526880 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia4e20f74699b4589b2771e8a0eaea401fba454fc
2020-12-15Remove akersten from OWNERS am: b978aa3d67 am: e4e0ebfa95nchalko
Original change: https://android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/1526880 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I46d52b31f5a20aa4e3247b2948e3288d841271a8
2020-12-15Remove akersten from OWNERS am: b978aa3d67nchalko
Original change: https://android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/1526880 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I47a41ff792b4763c291c7c97f4d66b25368ec665
2020-12-14Remove akersten from OWNERSandroid-s-preview-1nchalko
Bug: 175590839 Change-Id: I77c652e92618574fe244685c2c0af9e43537fa6c
2020-11-23Mark ab/6881855 as merged am: 683d33932a am: db823d6e6eXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/13113084 Change-Id: I530dcf78418cf3dc5d990bf74296f306db8dbbe4
2020-11-23Mark ab/6881855 as merged am: 683d33932aXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/13113084 Change-Id: Ib1e8dc827eac140ab1c19db0625d18f10e84269d
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I81f11da8fabf90e92e4c7db555554e99ff2df564
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 67ec2c5177 -s ours am: ↵Xin Li
38d858c17f -s ours am: 79aa8cbcfe -s ours am skip reason: Change-Id Icf1c7fed6ec253c640f1c7158e6285b55dbed051 with SHA-1 0c38e46c28 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/12796918 Change-Id: I642a8a8e0261b388c4aabea03d217382ac4fdddc
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 67ec2c5177 -s ours am: ↵Xin Li
38d858c17f -s ours am skip reason: Change-Id Icf1c7fed6ec253c640f1c7158e6285b55dbed051 with SHA-1 0c38e46c28 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/12796918 Change-Id: I350fe06070f7a2ccfc32c12cbc650a63464d846d
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 67ec2c5177 -s oursXin Li
am skip reason: Change-Id Icf1c7fed6ec253c640f1c7158e6285b55dbed051 with SHA-1 0c38e46c28 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/12796918 Change-Id: If6d54ce5027142218a36840399061ac1a1cd4852
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Icf1c7fed6ec253c640f1c7158e6285b55dbed051 Change-Id: Iea2de7266d85f229a7fd341f2c79aa5904f26378
2020-09-11[automerger skipped] Merge Android R am: d5cbd53d8e -s ours am: a611cef975 ↵Xin Li
-s ours am: 583412630f -s ours am: 181ba568d3 -s ours am: bc5ece3868 -s ours am skip reason: Change-Id I5667593cf89e4432861a5033ea57281507ddce74 with SHA-1 6cac9e854d is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/1422462 Change-Id: I6e6ab6f915f3824745f41553efb6ba97ccc30d16
2020-09-11[automerger skipped] Merge Android R am: d5cbd53d8e -s ours am: a611cef975 ↵Xin Li
-s ours am: 583412630f -s ours am: 181ba568d3 -s ours am skip reason: Change-Id I5667593cf89e4432861a5033ea57281507ddce74 with SHA-1 6cac9e854d is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/1422462 Change-Id: I318e1ac19c2c4b54483ef8f979739a7f7883355b
2020-09-11[automerger skipped] Merge Android R am: d5cbd53d8e -s ours am: a611cef975 ↵Xin Li
-s ours am: 583412630f -s ours am skip reason: Change-Id I5667593cf89e4432861a5033ea57281507ddce74 with SHA-1 6cac9e854d is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/1422462 Change-Id: If5dbb369e4e6c41fe98931af936c011136480353
2020-09-11[automerger skipped] Merge Android R am: d5cbd53d8e -s ours am: a611cef975 ↵Xin Li
-s ours am skip reason: Change-Id I5667593cf89e4432861a5033ea57281507ddce74 with SHA-1 6cac9e854d is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/1422462 Change-Id: If134aa0914df425907d37d77a2973efe8b168664
2020-09-11[automerger skipped] Merge Android R am: d5cbd53d8e -s oursXin Li
am skip reason: Change-Id I5667593cf89e4432861a5033ea57281507ddce74 with SHA-1 6cac9e854d is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/1422462 Change-Id: I5c5c8dccfe0a082e8b5b925918aa24fccc4fef25
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I5667593cf89e4432861a5033ea57281507ddce74 Change-Id: Icb2a984c9d631291971f5e5f3961b0797371cbf2
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 6cac9e854d -s ours am: cf81650c4e -s ours am: 3d46b10519 -s ours am: 4e2780b465 -s ours am skip reason: Change-Id I5a6abeeeab91e9f2ce7e6f49e863d76f21bd44d6 with SHA-1 56462add52 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/12470327 Change-Id: Ia7947d9e1adbfb86df5ab7f8a1309e6375129e61
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 6cac9e854d -s ours am: cf81650c4e -s ours am: 3d46b10519 -s ours am skip reason: Change-Id I5a6abeeeab91e9f2ce7e6f49e863d76f21bd44d6 with SHA-1 56462add52 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/12470327 Change-Id: I8fd8b27c9f54fe05451b2066f66ffda993d2b674
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 6cac9e854d -s ours am: cf81650c4e -s ours am skip reason: Change-Id I5a6abeeeab91e9f2ce7e6f49e863d76f21bd44d6 with SHA-1 56462add52 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/12470327 Change-Id: Ibf9be1de49d155ae7a1ee14d34fa66752806a025
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 6cac9e854d -s ours am skip reason: Change-Id I5a6abeeeab91e9f2ce7e6f49e863d76f21bd44d6 with SHA-1 56462add52 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/12470327 Change-Id: I947c2981922a8a88161220ff5088e0c6194dd906
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I5a6abeeeab91e9f2ce7e6f49e863d76f21bd44d6 Change-Id: I5667593cf89e4432861a5033ea57281507ddce74
2020-05-20Add an exported flag in manifest am: 65911c0797 am: b82ed64e09 am: ↵Ashwini Oruganti
56462add52 am: 0c38e46c28 am: d634dcaece Change-Id: I01dae09252bea1e2a26db1c081a04120912f7593
2020-05-20Add an exported flag in manifest am: 65911c0797 am: b82ed64e09 am: ↵Ashwini Oruganti
56462add52 am: 0c38e46c28 Change-Id: I3b23fe95b4bcd6995e638250688f85ce0a155390
2020-05-20Add an exported flag in manifest am: 65911c0797 am: b82ed64e09 am: 56462add52Ashwini Oruganti
Change-Id: Icf1c7fed6ec253c640f1c7158e6285b55dbed051
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 09:02:24 +0000