aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-10-28Merge "Convert TestingCamera/Android.mk to Android.bp" am: 960342434c 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_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_r7android-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-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_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_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-s5-releaseandroid14-qpr2-s4-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-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-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_332714010Yuntao Xu
2da8a1824b am: e0544a35f9 am: 7988bd4ea3 am: a412b7cc4d Original change: https://android-review.googlesource.com/c/platform/pdk/+/1863454 Change-Id: Idbb522d2f313914e60ccfd9d5bf4338f7a162d46
2021-10-28Merge "Convert TestingCamera/Android.mk to Android.bp" am: 960342434c am: ↵Yuntao Xu
2da8a1824b am: e0544a35f9 am: 7988bd4ea3 Original change: https://android-review.googlesource.com/c/platform/pdk/+/1863454 Change-Id: Ied22156adb4605b4a7a60b921a2ba3468b7c4edc
2021-10-28Merge "Convert TestingCamera/Android.mk to Android.bp" am: 960342434c am: ↵Yuntao Xu
2da8a1824b am: e0544a35f9 Original change: https://android-review.googlesource.com/c/platform/pdk/+/1863454 Change-Id: Iea2a9be5f6e86edceacfa351c1273fe5a0cf0140
2021-10-28Merge "Convert TestingCamera/Android.mk to Android.bp" am: 960342434c am: ↵Yuntao Xu
2da8a1824b Original change: https://android-review.googlesource.com/c/platform/pdk/+/1863454 Change-Id: I9c3721fbef7ce4b8f740778789b23ddb2a303ac9
2021-10-28Merge "Convert TestingCamera/Android.mk to Android.bp" am: 960342434candroid-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-1Yuntao Xu
Original change: https://android-review.googlesource.com/c/platform/pdk/+/1863454 Change-Id: Ibc6775bf9d8a1ace96706e3ce82439f6a3a8d054
2021-10-28Merge "Convert TestingCamera/Android.mk to Android.bp"Yuntao Xu
2021-10-28Merge "Convert TestingCamera2/Android.mk to Android.bp" am: 88b335f9d1 am: ↵Yuntao Xu
509a821095 am: c0a198e2f4 am: e93aa086d9 am: ae6fe28c01 Original change: https://android-review.googlesource.com/c/platform/pdk/+/1863453 Change-Id: I772667ff3369356918c369f6798a1529fb1a1522
2021-10-27Merge "Convert TestingCamera2/Android.mk to Android.bp" am: 88b335f9d1 am: ↵Yuntao Xu
509a821095 am: c0a198e2f4 am: e93aa086d9 Original change: https://android-review.googlesource.com/c/platform/pdk/+/1863453 Change-Id: I4cb9c96524188a380c09953f4d78d47e0f0c2592
2021-10-27Merge "Convert TestingCamera2/Android.mk to Android.bp" am: 88b335f9d1 am: ↵Yuntao Xu
509a821095 am: c0a198e2f4 Original change: https://android-review.googlesource.com/c/platform/pdk/+/1863453 Change-Id: Iad2260e6cd704314ecc0aa092c676d8c9efe7aee
2021-10-27Merge "Convert TestingCamera2/Android.mk to Android.bp" am: 88b335f9d1 am: ↵Yuntao Xu
509a821095 Original change: https://android-review.googlesource.com/c/platform/pdk/+/1863453 Change-Id: I8552830323ab079fcfcfc34336eef524734c5a81
2021-10-27Merge "Convert TestingCamera2/Android.mk to Android.bp" am: 88b335f9d1Yuntao Xu
Original change: https://android-review.googlesource.com/c/platform/pdk/+/1863453 Change-Id: I4b00b0b32487c90c2b1d71a161e699e145bd4c36
2021-10-27Merge "Convert TestingCamera2/Android.mk to Android.bp"Yuntao Xu
2021-10-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to pdk" am: c9018e6f34 am: 7b4b3020c2 ↵Treehugger Robot
am: 5444ea3360 am: f5f398a7fd am: 7327f9aa51 Original change: https://android-review.googlesource.com/c/platform/pdk/+/1864983 Change-Id: I1d463e2f9e7f4ea511a8ab9f1cc186924448841e
2021-10-20Merge "[LSC] Add LOCAL_LICENSE_KINDS to pdk" am: c9018e6f34 am: 7b4b3020c2 ↵Treehugger Robot
am: 5444ea3360 am: f5f398a7fd Original change: https://android-review.googlesource.com/c/platform/pdk/+/1864983 Change-Id: Ifc1cf42ed7b89ca0a21268717a66b524b1b5e2d4
2021-10-20Merge "[LSC] Add LOCAL_LICENSE_KINDS to pdk" am: c9018e6f34 am: 7b4b3020c2 ↵Treehugger Robot
am: 5444ea3360 Original change: https://android-review.googlesource.com/c/platform/pdk/+/1864983 Change-Id: I59eb32ccd2f0b28ca5f50d9221f40813cffae8d2
2021-10-20Merge "[LSC] Add LOCAL_LICENSE_KINDS to pdk" am: c9018e6f34 am: 7b4b3020c2Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/pdk/+/1864983 Change-Id: I146037ae0b40a43514f6eb265d87c15865c8f70d
2021-10-20Merge "[LSC] Add LOCAL_LICENSE_KINDS to pdk" am: c9018e6f34Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/pdk/+/1864983 Change-Id: Ib06136d0b8fa7de62be9863511fcde60aa14e291
2021-10-20Merge "[LSC] Add LOCAL_LICENSE_KINDS to pdk"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Treehugger Robot
2021-10-20[LSC] Add LOCAL_LICENSE_KINDS to pdkBob Badour
Added SPDX-license-identifier-Apache-2.0 to: apps/HelloPDK/jni/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Change-Id: I2393662f481b9034e8559ddf3b0f425b36dc1efd
2021-10-20Merge "Migrate HelloPDK to Soong" am: 4af5db9f95 am: 365e5273f3 am: ↵Trevor Radcliffe
676b316803 am: 5c3fbc9e96 am: e28d6595d8 Original change: https://android-review.googlesource.com/c/platform/pdk/+/1859594 Change-Id: I97bbf2240d85277e9be12f0015168864bc1cc55a
2021-10-20Merge "Migrate HelloPDK to Soong" am: 4af5db9f95 am: 365e5273f3 am: ↵Trevor Radcliffe
676b316803 am: 5c3fbc9e96 Original change: https://android-review.googlesource.com/c/platform/pdk/+/1859594 Change-Id: I26b33303a320b618aef37e6a0b3522e2939b6731
2021-10-20Merge "Migrate HelloPDK to Soong" am: 4af5db9f95 am: 365e5273f3 am: 676b316803Trevor Radcliffe
Original change: https://android-review.googlesource.com/c/platform/pdk/+/1859594 Change-Id: I2eb6eb332e192ef2122146e57188386373df1db7
2021-10-20Merge "Migrate HelloPDK to Soong" am: 4af5db9f95 am: 365e5273f3Trevor Radcliffe
Original change: https://android-review.googlesource.com/c/platform/pdk/+/1859594 Change-Id: I4022ffbc8e6bcb8eec9b6cc725444a1c56262780
2021-10-20Merge "Migrate HelloPDK to Soong" am: 4af5db9f95Trevor Radcliffe
Original change: https://android-review.googlesource.com/c/platform/pdk/+/1859594 Change-Id: I73bdcde76baf045f848ea8d443cba2a1d52e051e
2021-10-20Merge "Migrate HelloPDK to Soong"Trevor Radcliffe
2021-10-19Convert TestingCamera2/Android.mk to Android.bpYuntao Xu
Converted the Make file to a Soong one. Bug: 202170767 Test: compared the two apk files built by Make and Soong Test: TreeHugger Change-Id: I7f4146abf5f0b4c804819abf7c14796c2b87f25b
2021-10-19Convert TestingCamera/Android.mk to Android.bpYuntao Xu
Converted the Make file to a Soong one. Bug: 202170767 Test: compared the two apk files built by Make and Soong Test: TreeHugger Change-Id: I91fee42037570226cb195cb033195cf474e1fa76
2021-10-19Migrate HelloPDK to SoongTrevor Radcliffe
Also migrates dependency Fixes: 203211370 Test: Compare APKs and do main build Test: Treehugger Change-Id: I4f7705b3290e3cf74986472ff85083db7322b949
2021-05-15Merge "[LSC] Add LOCAL_LICENSE_KINDS to pdk" am: 92a69d4f25 am: 33a6fdfc47 ↵Treehugger Robot
am: 09fa39abc6 am: dbc297bfb5 am: 839f66289a Original change: https://android-review.googlesource.com/c/platform/pdk/+/1682212 Change-Id: I1f863f62ae8caf79feb90e890e045bfaa3195b76
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to pdk" am: 92a69d4f25 am: 33a6fdfc47 ↵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-releaseTreehugger Robot
am: 09fa39abc6 am: dbc297bfb5 Original change: https://android-review.googlesource.com/c/platform/pdk/+/1682212 Change-Id: I71766dc3359a4adb1937b97a6a599c97af8ec2aa
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to pdk" am: 92a69d4f25 am: 33a6fdfc47 ↵Treehugger Robot
am: 09fa39abc6 am: dbc297bfb5 Original change: https://android-review.googlesource.com/c/platform/pdk/+/1682212 Change-Id: Ic67991fc8e9dd29e7f1dc645cf87c12930e31747
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to pdk" am: 92a69d4f25 am: 33a6fdfc47 ↵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-devTreehugger Robot
am: 09fa39abc6 Original change: https://android-review.googlesource.com/c/platform/pdk/+/1682212 Change-Id: I35d710b19888f0069e6948aa177e79b5862c92fd
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to pdk" am: 92a69d4f25 am: 33a6fdfc47Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/pdk/+/1682212 Change-Id: I96be8a2c0ee5b8b7a14d2647842b9c7ec641a802
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to pdk" am: 92a69d4f25android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/pdk/+/1682212 Change-Id: I41c73f2ecb12d20fef2484d03efd3ce33743e732
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to pdk"android-s-beta-2android-s-beta-1Treehugger Robot
2021-04-20[LSC] Add LOCAL_LICENSE_KINDS to pdkBob Badour
Added SPDX-license-identifier-Apache-2.0 to: apps/HelloPDK/Android.mk apps/TestingCamera/Android.mk apps/TestingCamera2/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Iad325602c75f37417856edbc0c9c28dc42079b14
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: e70e1f5627 -s ↵Xin Li
ours am: 8a587df2d1 -s ours am: 263c81db05 -s ours am skip reason: Change-Id I95e73fbcab30ceb21d007fe10f00616fbd450542 with SHA-1 9d36462bac is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I495f11dc21d30b8c19fc1ea00d97ba115b1a8e68
2021-02-20Merge "[LSC] Add LOCAL_LICENSE_KINDS to pdk" am: 6d08176be6 am: 8e48312c88 ↵Bob Badour
am: 9fe2daa54a am: 065a1c6102 Original change: https://android-review.googlesource.com/c/platform/pdk/+/1588475 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia5b3a0abce71c7ce4227632aa624857d667a3021
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: e70e1f5627 -s ↵Xin Li
ours am: 8a587df2d1 -s ours am skip reason: Change-Id I95e73fbcab30ceb21d007fe10f00616fbd450542 with SHA-1 9d36462bac is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icc95f11f02a2e224e8c5f6ad3ba005f4acb6d70b
2021-02-20Merge "[LSC] Add LOCAL_LICENSE_KINDS to pdk" am: 6d08176be6 am: 8e48312c88 ↵Bob Badour
am: 9fe2daa54a Original change: https://android-review.googlesource.com/c/platform/pdk/+/1588475 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I50bbe2ace9e9fbcfa7797570b027e079e0703aed
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: e70e1f5627 -s oursXin Li
am skip reason: Change-Id I95e73fbcab30ceb21d007fe10f00616fbd450542 with SHA-1 9d36462bac is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I23406a57ec66df4436565139984510147c18ab0e
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I95e73fbcab30ceb21d007fe10f00616fbd450542 Change-Id: If98455fd179d426b6e2b060c5617d4ef923eb3df
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to pdk" am: 6d08176be6 am: 8e48312c88Bob Badour
Original change: https://android-review.googlesource.com/c/platform/pdk/+/1588475 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibb3d8e96a3b04fb94fddf18f44ef663cb697b75a
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to pdk" am: 6d08176be6Bob Badour
Original change: https://android-review.googlesource.com/c/platform/pdk/+/1588475 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I245dd8c75fb998726b39eacbca7621183a5db3fb
2021-02-18Merge "[LSC] Add LOCAL_LICENSE_KINDS to pdk"Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to pdkBob Badour
Added SPDX-license-identifier-Apache-2.0 to: apps/HelloPDK/jni/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I6fe73d990002e62efc211ee989a2a2c73a4a352d
2020-11-24Mark ab/6881855 as merged am: ddf96a77c1 am: 9d36462bacXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/pdk/+/13113099 Change-Id: I189a4f0fb58766ac70c8f73853c3d48da9ef7ddd
2020-11-24Mark ab/6881855 as merged am: ddf96a77c1Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/pdk/+/13113099 Change-Id: I95e73fbcab30ceb21d007fe10f00616fbd450542
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: I6a2bf50f88a10c24cd17b4fef8151d0464c2e61a
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 73f96d0f57 -s ours am: ↵Xin Li
ba164e33dc -s ours am: 5be7ccfd7d -s ours am skip reason: Change-Id I26019476c09d1526af95132d9e1948986fcc9513 with SHA-1 a8bbe0e10e is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/pdk/+/12796905 Change-Id: I62e0c29587a78c917289634e0b88e88c587b3a12