aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-02-11[automerger skipped] Empty merge of ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060android-wear-13.0.0-gpl_r1android-u-qpr1-beta-2.2-gplandroid-u-qpr1-beta-1-gplandroid-u-beta-4-gplandroid-u-beta-3-gplandroid-u-beta-2-gplandroid-u-beta-1-gplandroid-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-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_odp_341610000aml_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_ase_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_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-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-uwb-releaseandroid14-mainline-healthfitness-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseandroid13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-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-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseandroid-wear-13.0.0-gpl_r1aml_tz5_341510010aml_tz4_332714010Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: 3d40626c07 -s ours am: 21319805ca -s ours am skip reason: Merged-In I8ed3091ba4291cec533fa76e323b656756fd0e6f with SHA-1 768740fc37 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/squashfs-tools/+/16843771 Change-Id: I504a438f4f9ca08f81c1cb38054daa06a822e8a3
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: 3d40626c07 -s ours am skip reason: Merged-In I8ed3091ba4291cec533fa76e323b656756fd0e6f with SHA-1 768740fc37 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/squashfs-tools/+/16843771 Change-Id: I21a8632abe287f8c4dbfbb03a0f0aae730304a58
2022-02-11Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891Xin Li
Bug: 214455710 Merged-In: I8ed3091ba4291cec533fa76e323b656756fd0e6f Change-Id: I836d3dea0d12c6adc0ed3f29f56f0adcc6d91d65
2022-02-03Fix building squashfs-tools against musl am: 5a5d22baaa am: 6bc6c83b57 am: ↵Colin Cross
02c9be5851 am: 2b45191147 Original change: https://android-review.googlesource.com/c/platform/external/squashfs-tools/+/1969979 Change-Id: Ifc0e22671523a936a94fd01bb3ecb18b6130a398
2022-02-03Fix building squashfs-tools against musl am: 5a5d22baaa am: 6bc6c83b57 am: ↵Colin Cross
02c9be5851 Original change: https://android-review.googlesource.com/c/platform/external/squashfs-tools/+/1969979 Change-Id: Ie660aa43eaeea4a4d783b1af111e0578176322bb
2022-02-03Fix building squashfs-tools against musl am: 5a5d22baaa am: 6bc6c83b57Colin Cross
Original change: https://android-review.googlesource.com/c/platform/external/squashfs-tools/+/1969979 Change-Id: I886bea1ab3332c8ec0f68f9083053cebc948d97f
2022-02-03Fix building squashfs-tools against musl am: 5a5d22baaaColin Cross
Original change: https://android-review.googlesource.com/c/platform/external/squashfs-tools/+/1969979 Change-Id: Ie2a3296c04ac01fa17dbf710327f732f9a03b141
2022-02-02Fix building squashfs-tools against muslandroid-t-preview-1android-s-v2-beta-3android-t-preview-1android-s-v2-beta-3Colin Cross
Include sys/sysmacros.h for makedev to fix building squashfs-tools against musl libc. Bug: 190084016 Test: m USE_HOST_MUSL=true host-native Change-Id: Id915eeacf9e31eb3e5c973ad11427b91d8ebb9dd
2021-12-02squashfs-tools: Enable zstd support am: 768740fc37 am: ccce28963e am: ↵Satoshi Niwa
c675c6f45e am: 3721b7e594 Original change: https://android-review.googlesource.com/c/platform/external/squashfs-tools/+/1787392 Change-Id: I06dcc9d4c11f9e0e3d4b5e79d9a1c965f2899500
2021-12-02squashfs-tools: Enable zstd support am: 768740fc37 am: ccce28963e am: c675c6f45eSatoshi Niwa
Original change: https://android-review.googlesource.com/c/platform/external/squashfs-tools/+/1787392 Change-Id: I81e3ac93e45067711e02a50409471f11609953fe
2021-12-02squashfs-tools: Enable zstd support am: 768740fc37 am: ccce28963eSatoshi Niwa
Original change: https://android-review.googlesource.com/c/platform/external/squashfs-tools/+/1787392 Change-Id: I3122210f8bb6b4e8871bbada59166b27e817a5ff
2021-12-02squashfs-tools: Enable zstd support am: 768740fc37Satoshi Niwa
Original change: https://android-review.googlesource.com/c/platform/external/squashfs-tools/+/1787392 Change-Id: I9ec728c5b2c1589d3c9c25dcd5cec0fa11339389
2021-12-02squashfs-tools: Enable zstd supportSatoshi Niwa
Bug: 195505890 Bug: 207804563 Test: mksquashfs <dir_path> <img_path> -comp zstd && unsquashfs <img_path> Change-Id: I8ed3091ba4291cec533fa76e323b656756fd0e6f
2021-11-26Merge "squashfs-tools: Add zstd support" am: 9dd34b4d8a am: fc24adae74 am: ↵Treehugger Robot
579cd6a335 am: 45a54e70eb Original change: https://android-review.googlesource.com/c/platform/external/squashfs-tools/+/1787391 Change-Id: Ifdafed3942249f35ffa060b53fae7c674825bb9a
2021-11-26Merge "squashfs-tools: Add zstd support" am: 9dd34b4d8a am: fc24adae74 am: ↵Treehugger Robot
579cd6a335 Original change: https://android-review.googlesource.com/c/platform/external/squashfs-tools/+/1787391 Change-Id: I0f306e9060eacee9e418b4683b16add4f629bbb5
2021-11-26Merge "squashfs-tools: Add zstd support" am: 9dd34b4d8a am: fc24adae74Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/squashfs-tools/+/1787391 Change-Id: Id2689427c4842dbf990c8d4d9dbb3d42a67c8111
2021-11-26Merge "squashfs-tools: Add zstd support" am: 9dd34b4d8aTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/squashfs-tools/+/1787391 Change-Id: I2ae689970adad192b77a854673f2c8237937c18a
2021-11-26Merge "squashfs-tools: Add zstd support"Treehugger Robot
2021-11-26squashfs-tools: Add zstd supportSatoshi Niwa
This is a cherry-pick of: http://github.com/plougher/squashfs-tools/commit/6113361316d5ce5bfdc118d188e5617a1fcd747c Bug: 207804563 Test: mksquashfs <dir_path> <img_path> -comp zstd && unsquashfs <img_path> Change-Id: Ia1e8b71e76ae9e412feecf2c467f331b81c9d9bb
2021-09-03Add niwa@ to squashfs-tools/OWNERS am: f72fa6155d am: 6f4010286f am: ↵Satoshi Niwa
8d3843ec5b am: 29c209c3a5 am: 80a54dd2ab Original change: https://android-review.googlesource.com/c/platform/external/squashfs-tools/+/1817717 Change-Id: I4472c89ac52bf73d25c1f019a6c4d97a5bb1d6cd
2021-09-03Add niwa@ to squashfs-tools/OWNERS am: f72fa6155d am: 6f4010286f am: ↵Satoshi Niwa
8d3843ec5b am: 29c209c3a5 Original change: https://android-review.googlesource.com/c/platform/external/squashfs-tools/+/1817717 Change-Id: I903fedd09a94da43053183253e59738b3013d0af
2021-09-03Add niwa@ to squashfs-tools/OWNERS am: f72fa6155d am: 6f4010286f am: 8d3843ec5bSatoshi Niwa
Original change: https://android-review.googlesource.com/c/platform/external/squashfs-tools/+/1817717 Change-Id: I57706bfac06a0d78e36707f44a5d7045f3612267
2021-09-03Add niwa@ to squashfs-tools/OWNERS am: f72fa6155d am: 6f4010286fSatoshi Niwa
Original change: https://android-review.googlesource.com/c/platform/external/squashfs-tools/+/1817717 Change-Id: I6b5d857607313a4b29f0f32cc3b5c0c8ca9cc56e
2021-09-03Add niwa@ to squashfs-tools/OWNERS am: f72fa6155dandroid-s-v2-preview-1android-s-v2-preview-1Satoshi Niwa
Original change: https://android-review.googlesource.com/c/platform/external/squashfs-tools/+/1817717 Change-Id: I616b207bb7db26ad1c5373775acbe9f4dd44350a
2021-09-02Add niwa@ to squashfs-tools/OWNERSandroid-s-beta-5android-s-beta-5Satoshi Niwa
Context: b/195505890#comment12 ~ Bug: 195505890 Test: m Change-Id: I67341898950c41858605c0af9f7d9c4ca7b23a51
2021-05-29[LSC] Add LOCAL_LICENSE_KINDS to external/squashfs-tools am: 47b6c017fd am: ↵Bob Badour
cb96a98af5 am: b41de33b36 am: f1c7ff5f12 am: 0afe50d908 Original change: https://android-review.googlesource.com/c/platform/external/squashfs-tools/+/1588529 Change-Id: I76a34f481cd5d10f5d200488f97da27d87d9a3fe
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/squashfs-tools am: 47b6c017fd am: ↵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-releaseBob Badour
cb96a98af5 am: b41de33b36 am: f1c7ff5f12 Original change: https://android-review.googlesource.com/c/platform/external/squashfs-tools/+/1588529 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic51a440f2d71929ea461894c2fc89c5f6ec5393f
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/squashfs-tools am: 47b6c017fd am: ↵Bob Badour
cb96a98af5 am: b41de33b36 am: f1c7ff5f12 Original change: https://android-review.googlesource.com/c/platform/external/squashfs-tools/+/1588529 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I501cf4c1a4d6ba89327a54a1f4e62a5db7412089
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/squashfs-tools am: 47b6c017fd am: ↵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-1Bob Badour
cb96a98af5 am: b41de33b36 Original change: https://android-review.googlesource.com/c/platform/external/squashfs-tools/+/1588529 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ieb05f9a3993f62743a6a5ec8b6abab8adf8cdda6
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/squashfs-tools am: 47b6c017fd am: ↵Bob Badour
cb96a98af5 Original change: https://android-review.googlesource.com/c/platform/external/squashfs-tools/+/1588529 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1e9d9bb3c8b3fe02ba32375e99c2ecd3b2096a7c
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/squashfs-tools am: 47b6c017fdandroid-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/squashfs-tools/+/1588529 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I66d9de5500e30e5a1222627b0a3510a9fa9c891a
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/squashfs-toolsandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 to: Android.bp squashfs-tools/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I3db1c31e87dc64e842e4dfbff95802042cc4b319
2020-04-29Add METADATA to squashfs-tools: GPL+LGPL=RESTRICTED am: bd95ca0b29 am: ↵Bob Badour
b27e9296bd am: e48a4cb644 am: 22475bce87 am: 9c9f9a7a9d Change-Id: I23cb62e82ff23117eaab4bf53ac1c43a73a3a730
2020-04-29Add METADATA to squashfs-tools: GPL+LGPL=RESTRICTED am: bd95ca0b29 am: ↵Bob Badour
b27e9296bd am: e48a4cb644 am: 22475bce87 Change-Id: Iad428c9e8e71084455dbedc626ad876bc85024dc
2020-04-29Add METADATA to squashfs-tools: GPL+LGPL=RESTRICTED am: bd95ca0b29 am: ↵Bob Badour
b27e9296bd am: e48a4cb644 Change-Id: I2862747bc100fdf9d984c29799edda1a89e3b732
2020-04-29Add METADATA to squashfs-tools: GPL+LGPL=RESTRICTED am: bd95ca0b29 am: ↵Bob Badour
b27e9296bd Change-Id: I8d7c6a8bc13c7df601a69008a3961508c9815e36
2020-04-29Add METADATA to squashfs-tools: GPL+LGPL=RESTRICTED am: bd95ca0b29Bob Badour
Change-Id: I4015fe3f7f8cae94f447a338c834b9773365a2bd
2020-04-28Add METADATA to squashfs-tools: GPL+LGPL=RESTRICTEDBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I92098d4bcf326c492fd68c5dfaf4e5d1705c5fc3
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 75854981f7 -s ours am: 37ec92182f am: 2133de2dd6 am: e70234b358 -s ours am skip reason: subject contains skip directive Change-Id: I41520a125a1d8f896789ba7bdbb697dd0f0ff1d6
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 75854981f7 -s ours am: 37ec92182f am: 2133de2dd6 Change-Id: I0eeb3cc7cd9807476c8757e4886efa5cb53f9a46
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 75854981f7 -s ours am: 37ec92182f Change-Id: Ic37cbefd11e80c33ecea51e1489711794510a9c1
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 75854981f7 -s ours am skip reason: subject contains skip directive Change-Id: I90bde156b685bbfd8c62328211dcc0f839985be1
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I3d69dcb2aaf4b12801e8bc0c091c505930cad837
2020-04-03Include private/fs_config.h directly when needed am: 2474111e6f am: ↵Tom Cherry
5efd62031b am: 2135b406bb am: 0797df84c0 am: 83a519ace9 Change-Id: If7fd0293b24d69243f6e91e8be12ba6df1e988d2
2020-04-03Include private/fs_config.h directly when needed am: 2474111e6f am: ↵Tom Cherry
5efd62031b am: 2135b406bb am: 0797df84c0 Change-Id: Ife8650d988d071042d8e2963c6a6344e84069e79
2020-04-03Include private/fs_config.h directly when needed am: 2474111e6f am: ↵Tom Cherry
5efd62031b am: 2135b406bb Change-Id: I589607f3cdecc3e8478f1fd371b9a8625ee69090
2020-04-03Include private/fs_config.h directly when needed am: 2474111e6f am: 5efd62031bTom Cherry
Change-Id: I63e8b499204c4448adca24270d08c7ed1bd15f97
2020-04-03Include private/fs_config.h directly when needed am: 2474111e6f am: 5efd62031bTom Cherry
Change-Id: I45a499a34af4a71522a3917419970bd2b75a9629
2020-04-03Include private/fs_config.h directly when needed am: 2474111e6fTom Cherry
Change-Id: Idf3482545bbe7f32c47d979a546a85077e321462
2020-03-05Include private/fs_config.h directly when neededTom Cherry
This is no longer a transitive include of android_filesystem_config.h Bug: 149785767 Test: build Change-Id: I54c0610daaa5da0d675ff9185b94ebd315f7692f
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 01:36:16 +0000