summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-08-31Add more of the libnl-route API for nsjail am: d51bf7e713 am: 3b418d01f1 am: ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-wear-13.0.0-gpl_r1android-t-qpr3-beta-3-gplandroid-t-qpr3-beta-1-gplandroid-t-qpr2-beta-3-gplandroid-t-qpr2-beta-2-gplandroid-t-qpr1-beta-3-gplandroid-t-qpr1-beta-2-gplandroid-t-qpr1-beta-1-gplandroid-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_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_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_ase_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-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-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-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-odp-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-releaseandroid-wear-13.0.0-gpl_r1aml_tz4_332714010Dan Willemsen
045e63678e am: 749b89cd45 am: c3f5e91838 Original change: https://android-review.googlesource.com/c/platform/external/libnl/+/1813629 Change-Id: Ie6df3c266589a7e2f3f942367c3f6ede238bfa8a
2021-08-31Add more of the libnl-route API for nsjail am: d51bf7e713 am: 3b418d01f1 am: ↵Dan Willemsen
045e63678e am: 749b89cd45 Original change: https://android-review.googlesource.com/c/platform/external/libnl/+/1813629 Change-Id: I99e934efb61ec415870a542a6c7c58898876cbec
2021-08-31Add more of the libnl-route API for nsjail am: d51bf7e713 am: 3b418d01f1 am: ↵android-t-preview-1android-s-v2-beta-3android-t-preview-1android-s-v2-beta-3Dan Willemsen
045e63678e Original change: https://android-review.googlesource.com/c/platform/external/libnl/+/1813629 Change-Id: Ia3e507dd628a5b7de9cedf01ee55151a5b2ea8b3
2021-08-31Add more of the libnl-route API for nsjail am: d51bf7e713 am: 3b418d01f1Dan Willemsen
Original change: https://android-review.googlesource.com/c/platform/external/libnl/+/1813629 Change-Id: I065a3043cc8693cc0f703dea69665c1a8b441c9d
2021-08-31Add more of the libnl-route API for nsjail am: d51bf7e713android-s-v2-preview-1android-s-v2-preview-1Dan Willemsen
Original change: https://android-review.googlesource.com/c/platform/external/libnl/+/1813629 Change-Id: I1d6535380d7a17056368989e958471045ed55e04
2021-08-30Add more of the libnl-route API for nsjailandroid-s-beta-5android-s-beta-5Dan Willemsen
nsjail uses more than the minimal set we were building before. Change-Id: Iece87c9c8110e517031b7ac26528294ec6c7f5b5
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: Ic7d71c48609fb51c896f471e25db16086671e129
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: a26537104c -s ↵Xin Li
ours am: fbb49829b8 -s ours am: a674254ce9 -s ours am skip reason: Change-Id Ib481bb8f5fe6d185ca0af92fad929210607c2d5e with SHA-1 e2fca311a9 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ice439c650699e70f25c6c47007878237c05d0c87
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: a26537104c -s ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseXin Li
ours am: fbb49829b8 -s ours am: a674254ce9 -s ours am skip reason: Change-Id Ib481bb8f5fe6d185ca0af92fad929210607c2d5e with SHA-1 e2fca311a9 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie8a2e7f8f9b9222e7bee74fd3e040f95c37b36a1
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: a26537104c -s ↵android-s-qpr3-beta-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-s-qpr3-beta-1Xin Li
ours am: fbb49829b8 -s ours am skip reason: Change-Id Ib481bb8f5fe6d185ca0af92fad929210607c2d5e with SHA-1 e2fca311a9 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib5aedce7cf352639513c71e0987a621ded08ef8a
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: a26537104c -s oursXin Li
am skip reason: Change-Id Ib481bb8f5fe6d185ca0af92fad929210607c2d5e with SHA-1 e2fca311a9 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id45a18577b59f0937d189485cd31a3a6ff695c69
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-4Xin Li
Bug: 180401296 Merged-In: Ib481bb8f5fe6d185ca0af92fad929210607c2d5e Change-Id: I3b2b53f62121f244edda650b840da2b4c2bea19a
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libnl am: 6350618f12 am: ↵Bob Badour
ae33bd197d am: 19825f8303 am: 1ec8aaa920 Original change: https://android-review.googlesource.com/c/platform/external/libnl/+/1588895 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9edce2ffb4fc4e6fe1f2db2d604a5aedca0ac584
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libnl am: 6350618f12 am: ↵Bob Badour
ae33bd197d am: 19825f8303 am: 1ec8aaa920 Original change: https://android-review.googlesource.com/c/platform/external/libnl/+/1588895 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia8f4fb91cd75cab331280b6f0fa3c5ceb8fd6f0a
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libnl am: 6350618f12 am: ↵Bob Badour
ae33bd197d am: 19825f8303 Original change: https://android-review.googlesource.com/c/platform/external/libnl/+/1588895 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3dd227d351ddba1975fb03ec4e8c060938042c6a
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libnl am: 6350618f12 am: ae33bd197dBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libnl/+/1588895 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I06339a520933fe7ce97d38a88fb9217e1e109564
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libnl am: 6350618f12Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libnl/+/1588895 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I29991b9be0d69dad23fae617b27b7e81c8bdff26
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/libnlandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-BSD SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-GPL-3.0 SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0 legacy_unencumbered to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Id54714d408ca2563dfad390c6ea66e8bc0a6f69e
2021-01-06Add assemble_cvd to com.android.virt am: 6440970a5d am: b545089798 am: ↵Jiyong Park
0457ab0f3a Original change: https://android-review.googlesource.com/c/platform/external/libnl/+/1538731 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I61e01b985f28b9c7e366123bbf31fc03025f392b
2021-01-06Add assemble_cvd to com.android.virt am: 6440970a5d am: b545089798Jiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/libnl/+/1538731 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3b3b4f639bb097c7d8836711cd875e865c745e9f
2021-01-06Add assemble_cvd to com.android.virt am: 6440970a5dJiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/libnl/+/1538731 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I827b918d604d18155a5cfbccb0cb597098fc6236
2021-01-05Add assemble_cvd to com.android.virtJiyong Park
assemble_cvd directly or indirectly depends on these modules. To add assemble_cvd to the com.anroid.virt APEX, these modules are marked as being available to the APEX. Bug: 174639526 Test: m com.android.virt Change-Id: I033fd204458271165f4627365d90e3da328a1cf5
2020-11-24Mark ab/6881855 as merged am: f2989ef903 am: e2fca311a9Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libnl/+/13112841 Change-Id: I597a3d2181518b255bb00514848f10199e91aa89
2020-11-24Mark ab/6881855 as merged am: f2989ef903Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libnl/+/13112841 Change-Id: Ib481bb8f5fe6d185ca0af92fad929210607c2d5e
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I7392107d85165c8670ed0ea232572e7ccd7288c2
2020-11-12Add product_available to product available modules am: 75006a2c7d am: ↵Justin Yun
4e7812aafb am: 4d3a74eb06 am: 716f75f858 Original change: https://android-review.googlesource.com/c/platform/external/libnl/+/1495978 Change-Id: Ie149f3fe849d4538a3df57ab92d57bcd40a2711c
2020-11-12Add product_available to product available modules am: 75006a2c7d am: ↵Justin Yun
4e7812aafb am: 4d3a74eb06 Original change: https://android-review.googlesource.com/c/platform/external/libnl/+/1495978 Change-Id: I9307551ee80788a222e6d8f6edd9b72dfe1ee87c
2020-11-12Add product_available to product available modules am: 75006a2c7d am: 4e7812aafbJustin Yun
Original change: https://android-review.googlesource.com/c/platform/external/libnl/+/1495978 Change-Id: I139e2d3deb676c7ea1399d55e1f1fd76580640f5
2020-11-12Add product_available to product available modules am: 75006a2c7dJustin Yun
Original change: https://android-review.googlesource.com/c/platform/external/libnl/+/1495978 Change-Id: I7d8a1ea5313e8c4e22befa1dbd28a27d3b5ee6c7
2020-11-11Add product_available to product available modulesJustin Yun
vendor_available modules were available to product modules. However, not all vendor_available modules are required to be available to product modules. Some modules want to be available only to product modules but not vendor modules. To cover the requirement, we separate product_available from vendor_available. vendor_available will not provide product available module. Bug: 150902910 Test: build Change-Id: I2ffd02cf8cc08fbe40f3d06ec071aad86d09740e
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: dad964671b -s ours am: ↵Xin Li
e2b1c230f9 -s ours am: 739827acc9 -s ours am skip reason: Change-Id Ia4a7208a0150acd26e43dc43070a414ce6cd936e with SHA-1 ff9c88b230 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libnl/+/12796972 Change-Id: I3a4128a94e2a59431d5320247b43a15c0a007160
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: dad964671b -s ours am: ↵Xin Li
e2b1c230f9 -s ours am skip reason: Change-Id Ia4a7208a0150acd26e43dc43070a414ce6cd936e with SHA-1 ff9c88b230 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libnl/+/12796972 Change-Id: I56159c2d502cf15b11909b58f81ecc18e1ed6074
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: dad964671b -s oursXin Li
am skip reason: Change-Id Ia4a7208a0150acd26e43dc43070a414ce6cd936e with SHA-1 ff9c88b230 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libnl/+/12796972 Change-Id: Ica9b7e8e88856625f8cff887c5030895ee1e6dcd
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Ia4a7208a0150acd26e43dc43070a414ce6cd936e Change-Id: Icc907917d9ae7e001c04cc0e2d3e4186a2fec927
2020-09-22Don't use include/linux-private on bionic targets am: 78b225a0d2 am: ↵Jiyong Park
16c68679e3 am: 5e70c0fa8f am: 24c9fd0059 am: ba698d2dfb Original change: https://android-review.googlesource.com/c/platform/external/libnl/+/1429905 Change-Id: If4c5cbfd22e182a1d971e62cb23883bf3f0a8dc4
2020-09-22Don't use include/linux-private on bionic targets am: 78b225a0d2 am: ↵Jiyong Park
16c68679e3 am: 5e70c0fa8f am: 24c9fd0059 Original change: https://android-review.googlesource.com/c/platform/external/libnl/+/1429905 Change-Id: Ib55da5d94b6f6d63c5e5cee94f5085f52cde3947
2020-09-22Don't use include/linux-private on bionic targets am: 78b225a0d2 am: ↵Jiyong Park
16c68679e3 am: 5e70c0fa8f Original change: https://android-review.googlesource.com/c/platform/external/libnl/+/1429905 Change-Id: Ic15109e05f943b351c97d1409cbeee4abfb82fe3
2020-09-22Don't use include/linux-private on bionic targets am: 78b225a0d2 am: 16c68679e3Jiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/libnl/+/1429905 Change-Id: Ie6cf81705510af1ba20f310aa4f8f8e73595d85d
2020-09-22Don't use include/linux-private on bionic targets am: 78b225a0d2Jiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/libnl/+/1429905 Change-Id: Id044624746edd1e9852dedc0faca285b3e697a0d
2020-09-18Don't use include/linux-private on bionic targetsJiyong Park
target.host covers both linux_glibc and linux_bionic. Including the headers in the directory for linux_bionic causes missing type errors because the headers were not written with bionic in mind. Includ the headers only for linux_glibc. linux_bionic doesn't need extra headers because android (the device target which also uses bionic) is built as such. Bug: 159685774 Test: HOST_CROSS_OS=linux_bionic HOST_CROSS_ARCH=arm64 m \ out/soong/host/linux_bionic-arm64/bin/run_cvd Change-Id: I4a223759e6665ed740e3fa3c9c2dabf60828c9bf
2020-04-24Add license type: GPL+LGPL are RESTRICTED licenses am: b6829019a9 am: ↵Bob Badour
4aa55aaed6 am: 0535db6ad3 am: ff9c88b230 am: 18f7f650ca Change-Id: I1d533ded3321eb10e58cec3fbbb1346edfe271a3
2020-04-24Add license type: GPL+LGPL are RESTRICTED licenses am: b6829019a9 am: ↵Bob Badour
4aa55aaed6 am: 0535db6ad3 am: ff9c88b230 Change-Id: I67130097124ff46c2ab9504b577c38878091c651
2020-04-24Add license type: GPL+LGPL are RESTRICTED licenses am: b6829019a9 am: ↵Bob Badour
4aa55aaed6 am: 0535db6ad3 Change-Id: Ia4a7208a0150acd26e43dc43070a414ce6cd936e
2020-04-24Add license type: GPL+LGPL are RESTRICTED licenses am: b6829019a9 am: 4aa55aaed6Bob Badour
Change-Id: Idc007a18d8122f8238b2ed24dbd2b0ab68ebf300
2020-04-24Add license type: GPL+LGPL are RESTRICTED licenses am: b6829019a9Bob Badour
Change-Id: Ic80e4a8314ae0d5ecd399ea00f8cd9432a5f45ab
2020-04-23Add license type: GPL+LGPL are RESTRICTED licensesBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Icd1bdf25d4568373fc09b8790af56fae7e7d5353
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 710d751bd6 -s ours am: b20c6eeaea am: 894f4aa052 am: 0c060056b3 -s ours am skip reason: subject contains skip directive Change-Id: I0c2d3717ed1ffa9f992f1ac53760564e01dce581
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 710d751bd6 -s ours am: b20c6eeaea am: 894f4aa052 Change-Id: I9806a842d8e18115eccf8f050ec2d36b3f9904c3
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 710d751bd6 -s ours am: b20c6eeaea Change-Id: I2a7fb4095276f3ba2377d016a14cad363d5110c8
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 710d751bd6 -s ours am skip reason: subject contains skip directive Change-Id: I0ff109e1dac40481b9a2ea3748562cab0e8f3427