aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-10-08[automerger skipped] Merge "Merge Android 12" am: f601f40512 -s ours am: ↵HEADt_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_r3android-vts-14.0_r2android-vts-14.0_r1android-u-beta-1-gplandroid-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_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-platform-13.0.0_r1android-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_r4android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r3android-14.0.0_r29android-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_331131000mastermain-16k-with-phonesmain-16kmainandroid14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-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-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
430a585802 -s ours am: b0ab7df290 -s ours am: e87053a4f8 -s ours am: 5783987ad0 -s ours am skip reason: Merged-In Icf7492e392cf20986990be2752e6357d4cdb352c with SHA-1 2fe8554eae is already in history Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1847313 Change-Id: Ib377d093adc53b68b77975882c96b674b07e8679
2021-10-08[automerger skipped] Merge "Merge Android 12" am: f601f40512 -s ours am: ↵Xin Li
430a585802 -s ours am: b0ab7df290 -s ours am: e87053a4f8 -s ours am skip reason: Merged-In Icf7492e392cf20986990be2752e6357d4cdb352c with SHA-1 2fe8554eae is already in history Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1847313 Change-Id: I0bb80a719f54acc713629d1b85b58e5eb528974a
2021-10-08[automerger skipped] Merge "Merge Android 12" am: f601f40512 -s ours am: ↵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
430a585802 -s ours am: b0ab7df290 -s ours am skip reason: Merged-In Icf7492e392cf20986990be2752e6357d4cdb352c with SHA-1 2fe8554eae is already in history Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1847313 Change-Id: I621e60e077d18aa33704b79f635f33b4000c7d23
2021-10-08[automerger skipped] Merge "Merge Android 12" am: f601f40512 -s ours am: ↵Xin Li
430a585802 -s ours am skip reason: Merged-In Icf7492e392cf20986990be2752e6357d4cdb352c with SHA-1 2fe8554eae is already in history Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1847313 Change-Id: I93bf2a928c29a8a87e185b375fdcc2c728110200
2021-10-08[automerger skipped] Merge "Merge Android 12" am: f601f40512 -s oursXin Li
am skip reason: Merged-In Icf7492e392cf20986990be2752e6357d4cdb352c with SHA-1 2fe8554eae is already in history Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1847313 Change-Id: I3aa715c5e25f32607dc96630bc0ac233c6d35b02
2021-10-07Merge "Merge Android 12"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
2021-10-06Merge Android 12Xin Li
Bug: 202323961 Merged-In: Icf7492e392cf20986990be2752e6357d4cdb352c Change-Id: I8980bf56fe03eb3dc5306d50d529e6417248934c
2021-09-16[automerger skipped] Add android:exported tag am: 2fe8554eae -s ours am: ↵Colin Cross
6d9b730332 -s ours am: 6a26aec165 -s ours am: 96547f6d9f -s ours am skip reason: Merged-In Icf7492e392cf20986990be2752e6357d4cdb352c with SHA-1 c61b39439e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/15828964 Change-Id: I3f7295e027d903351d2a0fc4760e11279bffb018
2021-09-16[automerger skipped] Add android:exported tag am: 2fe8554eae -s ours am: ↵Colin Cross
6d9b730332 -s ours am: 6a26aec165 -s ours am skip reason: Merged-In Icf7492e392cf20986990be2752e6357d4cdb352c with SHA-1 c61b39439e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/15828964 Change-Id: I72bc4503953a84ba12d16f159f8d7952722d739d
2021-09-16[automerger skipped] Add android:exported tag am: 2fe8554eae -s ours am: ↵Colin Cross
6d9b730332 -s ours am skip reason: Merged-In Icf7492e392cf20986990be2752e6357d4cdb352c with SHA-1 c61b39439e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/15828964 Change-Id: I6d1577f41d4e0597864ca45205d26e70c1b99789
2021-09-16[automerger skipped] Add android:exported tag am: 2fe8554eae -s oursColin Cross
am skip reason: Merged-In Icf7492e392cf20986990be2752e6357d4cdb352c with SHA-1 c61b39439e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/15828964 Change-Id: I5a798959c8bd28746b91dfcf3a0c93c1bccbe5b5
2021-09-14Add android:exported tagtemp_sam_202323961Colin Cross
These are now required to be explicitly specified for apps targetting API 31. Bug: 195988762 Test: make Change-Id: Icf7492e392cf20986990be2752e6357d4cdb352c Merged-In: Icf7492e392cf20986990be2752e6357d4cdb352c (cherry picked from commit 9a342bde5ebf5c4367346093e6c181e1749c196e)
2021-08-19[automerger skipped] Add android:exported tag am: c61b39439e am: f7e402b885 ↵Colin Cross
am: 4ffb4eee52 -s ours am skip reason: Merged-In Icf7492e392cf20986990be2752e6357d4cdb352c with SHA-1 9a342bde5e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/15600751 Change-Id: I5fe81eeb77b37e2903cc357ad77c1d9b1b02818c
2021-08-19Add android:exported tag am: c61b39439e am: f7e402b885Colin Cross
Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/15600751 Change-Id: I47df3299f871bae1b3c85d0d71502946241e33e9
2021-08-18Add android:exported tag am: c61b39439eColin Cross
Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/15600751 Change-Id: I50bd6fafd1a7cb10fb45e54989e11ce9e4bfe56a
2021-08-17Add android:exported tagColin Cross
These are now required to be explicitly specified for apps targetting API 31. Bug: 195988762 Test: make Change-Id: Icf7492e392cf20986990be2752e6357d4cdb352c Merged-In: Icf7492e392cf20986990be2752e6357d4cdb352c (cherry picked from commit 9a342bde5ebf5c4367346093e6c181e1749c196e)
2021-08-11Add android:exported tagColin Cross
These are now required to be explicitly specified for apps targetting API 31. Bug: 195988762 Test: make Change-Id: Icf7492e392cf20986990be2752e6357d4cdb352c
2021-05-17Merge "Convert src/main/Android.mk to Android.bp" am: 3c3a5d95b6 am: ↵Yuntao Xu
8184c3c810 am: a927501359 am: 3dbb547fc2 am: 3d280462b5 am: 43a669ddff Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1690211 Change-Id: I3dbc7b79c5b0f0f3bd059b2c784eb14d01f553ab
2021-05-15Merge "Convert src/main/Android.mk to Android.bp" am: 3c3a5d95b6 am: ↵Yuntao Xu
8184c3c810 am: a927501359 am: 3dbb547fc2 am: ad478bcd67 am: e092d2a1db Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1690211 Change-Id: I9184789540a4d8854cfc3c77bf237e72bf3f3f2b
2021-05-15Merge "[LSC] Add LOCAL_LICENSE_KINDS to developers/samples/android" am: ↵Treehugger Robot
7d23920f2b am: c0d9c71791 am: 02af27736f am: b7529718e5 am: a5e3bd7651 Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1682207 Change-Id: Ic1b6997e680e75c979304c4a5b9681455a4b410a
2021-05-15Merge "Convert src/main/Android.mk to Android.bp" am: 3c3a5d95b6 am: ↵Yuntao Xu
8184c3c810 am: a927501359 am: 3dbb547fc2 am: 3d280462b5 Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1690211 Change-Id: I8220b258e36cc4464af2898196916849978831c3
2021-04-30Merge "Convert src/main/Android.mk to Android.bp" am: 3c3a5d95b6 am: ↵Yuntao Xu
8184c3c810 am: a927501359 am: 3dbb547fc2 am: ad478bcd67 Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1690211 Change-Id: I3c511c1e83467b566188170c158f70da8af2a0d1
2021-04-30Merge "Convert src/main/Android.mk to Android.bp" am: 3c3a5d95b6 am: ↵android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-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_r12android12L-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-releaseYuntao Xu
8184c3c810 am: a927501359 am: 3dbb547fc2 Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1690211 Change-Id: Ibac54d69d529f010876b6a9d1dd52483f059a857
2021-04-30Merge "Convert src/main/Android.mk to Android.bp" am: 3c3a5d95b6 am: ↵Yuntao Xu
8184c3c810 am: a927501359 am: 3dbb547fc2 Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1690211 Change-Id: I82edeb768f33ccd64281cb20ea3451ad3380262f
2021-04-30Merge "Convert src/main/Android.mk to Android.bp" am: 3c3a5d95b6 am: ↵Yuntao Xu
8184c3c810 am: a927501359 am: 3dbb547fc2 Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1690211 Change-Id: Iee3a660e78b9cdc232a7aaa3175ba287ef171dd2
2021-04-30Merge "Convert src/main/Android.mk to Android.bp" am: 3c3a5d95b6 am: ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-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-devandroid12-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-devYuntao Xu
8184c3c810 am: a927501359 Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1690211 Change-Id: I233f2c5cea9ef78f64d963c4a9d10234723a6676
2021-04-30Merge "Convert src/main/Android.mk to Android.bp" am: 3c3a5d95b6 am: 8184c3c810Yuntao Xu
Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1690211 Change-Id: I25e2744b0bea9fbfedf6b6d8a413554ed987ea62
2021-04-30Merge "Convert src/main/Android.mk to Android.bp" am: 3c3a5d95b6android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Yuntao Xu
Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1690211 Change-Id: Ic8c3a89b04ad07e763be1a98f534cb3efcdd815a
2021-04-30Merge "Convert src/main/Android.mk to Android.bp"android-s-beta-2android-s-beta-1Yuntao Xu
2021-04-28Convert src/main/Android.mk to Android.bpYuntao Xu
Convert the Make file to a Soong one Bug: 186677673 Test: compared the two apk files built by Make and Soong Test: TreeHugger Change-Id: I90506bd1d462f56b588907bbb8f8974a78e06229
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to developers/samples/android" am: ↵Treehugger Robot
7d23920f2b am: c0d9c71791 am: 02af27736f am: b7529718e5 Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1682207 Change-Id: I85f6b30ca24e6b1ceae01bc3fb6dae4348f7042d
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to developers/samples/android" am: ↵Treehugger Robot
7d23920f2b am: c0d9c71791 am: 02af27736f am: b7529718e5 Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1682207 Change-Id: I6482bb235c6191ceb086e75c1c822289d15fa41a
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to developers/samples/android" am: ↵Treehugger Robot
7d23920f2b am: c0d9c71791 am: 02af27736f Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1682207 Change-Id: I294a3ec3e3279ca292fc855cd7b6b14a605d91fb
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to developers/samples/android" am: ↵Treehugger Robot
7d23920f2b am: c0d9c71791 Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1682207 Change-Id: Iee43e7fcc34efdb0d03b0d13840f527ac0f71d0f
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to developers/samples/android" am: ↵Treehugger Robot
7d23920f2b Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1682207 Change-Id: If2ac34fb2039f39f01788907ab22f233400a484a
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to developers/samples/android"Treehugger Robot
2021-04-20[LSC] Add LOCAL_LICENSE_KINDS to developers/samples/androidBob Badour
Added SPDX-license-identifier-Apache-2.0 to: security/FingerprintDialog/Application/src/main/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I4ce8436201b26f13f926804ea91a0fed1d687893
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: ad509e0e1d -s ↵Xin Li
ours am: f547fbc1c8 -s ours am: 02b5a96f2a -s ours am skip reason: Change-Id I0e1120aafae610027333fd7f1c995d908f6e089a with SHA-1 e581b694ac is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I282a9a332290ab3b69a9df9ad3a7a41f42de022c
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: ad509e0e1d -s ↵Xin Li
ours am: f547fbc1c8 -s ours am skip reason: Change-Id I0e1120aafae610027333fd7f1c995d908f6e089a with SHA-1 e581b694ac is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I17b6867153d1581f517df33a48908e9d66fb32e0
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: ad509e0e1d -s oursXin Li
am skip reason: Change-Id I0e1120aafae610027333fd7f1c995d908f6e089a with SHA-1 e581b694ac is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia416253bce1c4eaff620bdc478aedb95115317f3
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I0e1120aafae610027333fd7f1c995d908f6e089a Change-Id: I5e282a1d9c93f15a3f2d6a3269ee96dab3b90da8
2020-11-24Mark ab/6881855 as merged am: bae055f6ff am: e581b694acXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/13111968 Change-Id: I1ceff7a8db2845e677173b99545978be11a3e3b1
2020-11-24Mark ab/6881855 as merged am: bae055f6ffXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/13111968 Change-Id: I0e1120aafae610027333fd7f1c995d908f6e089a
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: Ib34a906538821d3fecbdb4dd77b8803ad2e27659
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 63bd46a79d -s ours am: ↵Xin Li
f4b69e1ffe -s ours am: 9b0c53db9a -s ours am skip reason: Change-Id I86165be8b788aaa750d9a1d00d3188801d735bd6 with SHA-1 37708888fb is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/12794722 Change-Id: I4994475774c43e0798f3a202a00273e5838cdec2
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 63bd46a79d -s ours am: ↵Xin Li
f4b69e1ffe -s ours am skip reason: Change-Id I86165be8b788aaa750d9a1d00d3188801d735bd6 with SHA-1 37708888fb is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/12794722 Change-Id: I8e3aaa18d7bd7c69e8b16881e1fee556dd048bfe
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 63bd46a79d -s oursXin Li
am skip reason: Change-Id I86165be8b788aaa750d9a1d00d3188801d735bd6 with SHA-1 37708888fb is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/12794722 Change-Id: I89bda30ff043b812b89af06d38dedf776e44f34b
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I86165be8b788aaa750d9a1d00d3188801d735bd6 Change-Id: I4c04e98fe8861c8a6d4a007cbd15ca6973c7f53a
2020-09-11[automerger skipped] Merge "Merge Android R" am: ddb9444be0 -s ours am: ↵Xin Li
46d255c5ee -s ours am: 79e6f36845 -s ours am: c1c1d6bf6c -s ours am: 48f1fed848 -s ours am skip reason: Change-Id I3eacc623ecb0e0c2fb65633d5d6ab9df811c61dd with SHA-1 3f8d030a1f is in history Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1422288 Change-Id: Ida40da640ec072962780e7dc1c732227b4f12314
2020-09-11[automerger skipped] Merge "Merge Android R" am: ddb9444be0 -s ours am: ↵Xin Li
46d255c5ee -s ours am: 79e6f36845 -s ours am: c1c1d6bf6c -s ours am skip reason: Change-Id I3eacc623ecb0e0c2fb65633d5d6ab9df811c61dd with SHA-1 3f8d030a1f is in history Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1422288 Change-Id: Ifff2652f8c190fcc64d55adadf35cb2c19a7bc8a
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 17:40:15 +0000