aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-01-14update OWNERS am: 48504f2895 am: cd8cab64fc am: 42f40391a1 am: 5214b67bcdt_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-u-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-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz5_341510010aml_tz4_332714010Mike Frysinger
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1949516 Change-Id: I9b64b55113ab79bc564d6cbe6f5a05b28b8ea908
2022-01-14update OWNERS am: 48504f2895 am: cd8cab64fc am: 42f40391a1Mike Frysinger
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1949516 Change-Id: I403a105418a2bf0e0528da6729e440257f982b31
2022-01-14update OWNERS am: 48504f2895 am: cd8cab64fcMike Frysinger
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1949516 Change-Id: Ibea95bc8d75232f74ca7de455928ed9f42f4be3c
2022-01-14update OWNERS am: 48504f2895Mike Frysinger
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1949516 Change-Id: If5485c9ab536153a0a9ed39ce991abad4545190d
2022-01-14update OWNERSandroid-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-1Mike Frysinger
This project is only used by UE now, so point OWNERS to that. Bug: None Test: None Change-Id: I27e84411af8023e62c1a2fcad3a66b75aef1b401
2022-01-14Add missing include am: 2d1fcf73d9 am: d13f404a8c am: 5d70081d2b am: ce95b09f97Colin Cross
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1948950 Change-Id: Icb1ed41e429c24afbb522fb419c7af9632e56eee
2022-01-14Add missing include am: 2d1fcf73d9 am: d13f404a8c am: 5d70081d2bColin Cross
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1948950 Change-Id: I850a7bb350481fa064f9a6233e83501a466b581a
2022-01-14Add missing include am: 2d1fcf73d9 am: d13f404a8cColin Cross
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1948950 Change-Id: Ib6067cb7e943b126af8135953e3d6cbc561b43b9
2022-01-13Add missing include am: 2d1fcf73d9Colin Cross
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1948950 Change-Id: I377197dc972537a4f5b570b63127ae91e9ced6e5
2022-01-13Add missing includeColin Cross
Add missing sys/types.h include to fix building against musl libc. Bug: 190084016 Test: m USE_HOST_HOST=true host-native Change-Id: Ic75cb8db8978c3478cce65ec8838228bd245950d
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I7a5a4b0b411292fa437846ad1f2b756e3d5ebaf4
2021-05-17Use libgtest_prod_headers. am: 7363599940 am: bbaab59d11 am: df5fcad0cd am: ↵Elliott Hughes
0fd3f6ac2e am: fb609bc627 Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1683961 Change-Id: I088228c863dcbf2b28769dc6210703a7ddb4efc9
2021-04-26Use libgtest_prod_headers. am: 7363599940 am: bbaab59d11 am: df5fcad0cd 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-releaseElliott Hughes
0fd3f6ac2e Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1683961 Change-Id: If2757ea276681dfaa0770c491c4d270aca643143
2021-04-26Use libgtest_prod_headers. am: 7363599940 am: bbaab59d11 am: df5fcad0cd am: ↵Elliott Hughes
0fd3f6ac2e Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1683961 Change-Id: I5e303d60db7062a11df575cc4356d3d8b491cf81
2021-04-26Use libgtest_prod_headers. am: 7363599940 am: bbaab59d11 am: df5fcad0cd 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-releaseElliott Hughes
0fd3f6ac2e Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1683961 Change-Id: I8f7a807ba71e5a3caa8ec5cf9c61f24430ba9faf
2021-04-26Use libgtest_prod_headers. am: 7363599940 am: bbaab59d11 am: df5fcad0cdandroid-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-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-devandroid-s-v2-preview-1Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1683961 Change-Id: Ie818b73280a6cb61338c51fae7e9d394aea718db
2021-04-26Use libgtest_prod_headers. am: 7363599940 am: bbaab59d11Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1683961 Change-Id: Idf6f4c14d3e430c282158c9bc5340b43f4001cc5
2021-04-26Use libgtest_prod_headers. am: 7363599940android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1683961 Change-Id: I48a63633751a11b61806503662fc3d4145601869
2021-04-22Use libgtest_prod_headers.android-s-beta-2android-s-beta-1Elliott Hughes
Bug: http://b/185916167 Test: treehugger Change-Id: I9c1e0645d291b5111bd8b04f100e6ad5e8c3bcfc
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: ead19d6ec6 -s ↵Xin Li
ours am: a004b8be7e -s ours am: e93f97fd14 -s ours am skip reason: Change-Id Iddb240a58054631a46732df42c32b693d73f0727 with SHA-1 2ad4083f8a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I35ed2cf09b891727fa67fa50531e918f42d181b4
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: ead19d6ec6 -s ↵Xin Li
ours am: a004b8be7e -s ours am: e93f97fd14 -s ours am skip reason: Change-Id Iddb240a58054631a46732df42c32b693d73f0727 with SHA-1 2ad4083f8a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I11f8a8eeaeaddb2a698a70be524033950b0d5654
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: ead19d6ec6 -s ↵Xin Li
ours am: a004b8be7e -s ours am skip reason: Change-Id Iddb240a58054631a46732df42c32b693d73f0727 with SHA-1 2ad4083f8a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iae42204d25be012f969719ed1b668f3069aa14a5
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: ead19d6ec6 -s oursXin Li
am skip reason: Change-Id Iddb240a58054631a46732df42c32b693d73f0727 with SHA-1 2ad4083f8a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If4945abb0df8108dedf3db28e13148c794f5a5c6
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: Iddb240a58054631a46732df42c32b693d73f0727 Change-Id: I8ff9288119b7ab3ac276cbab9fcb17e02929cde3
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libbrillo am: a40b7ac895 am: ↵Bob Badour
436b555839 am: 74db6fcf21 am: 2fc37ab958 Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1589001 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8c848bb98497f4daf09ffefbaef587b213b1b5e0
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libbrillo am: a40b7ac895 am: ↵Bob Badour
436b555839 am: 74db6fcf21 am: 2fc37ab958 Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1589001 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6eaa45bc48f03608285d88fe84c10d3ba7bdc7ab
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libbrillo am: a40b7ac895 am: ↵Bob Badour
436b555839 am: 74db6fcf21 Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1589001 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie9b7eb1c07a15888345e92c6dcb72f88566aa28e
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libbrillo am: a40b7ac895 am: ↵Bob Badour
436b555839 Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1589001 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib54d138915c154d8e070d6eaf7c4f10dd651ecf3
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libbrillo am: a40b7ac895Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1589001 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I065c9658b1e782bc07af8ec63f3956cceba52968
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/libbrilloandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ib9f0626167e657ffbb257116da65f7d145cc0e41
2020-11-24Mark ab/6881855 as merged am: ce54b28e3f am: 2ad4083f8aXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbrillo/+/13112819 Change-Id: I25432d95a13b7e511c379919a339922987c71cde
2020-11-24Mark ab/6881855 as merged am: ce54b28e3fXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbrillo/+/13112819 Change-Id: Iddb240a58054631a46732df42c32b693d73f0727
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I90959a183460f9e982f673c537f285dfe14672d7
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 570ae6f20e -s ours am: ↵Xin Li
aa1072b0bf -s ours am: 14309357ac -s ours am skip reason: Change-Id I6cf9a3a957c1ba217492bac953803f46af3dc911 with SHA-1 68f5677b92 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbrillo/+/12797052 Change-Id: I4dd29e3915fab5a2f9f0ed08c17a5dc9e435acc1
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 570ae6f20e -s ours am: ↵Xin Li
aa1072b0bf -s ours am skip reason: Change-Id I6cf9a3a957c1ba217492bac953803f46af3dc911 with SHA-1 68f5677b92 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbrillo/+/12797052 Change-Id: I8a8f45066f59594768a403440af3b95041c097f2
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 570ae6f20e -s oursXin Li
am skip reason: Change-Id I6cf9a3a957c1ba217492bac953803f46af3dc911 with SHA-1 68f5677b92 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbrillo/+/12797052 Change-Id: Ibf92215f231e57b36aba683121f07346d3503642
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I6cf9a3a957c1ba217492bac953803f46af3dc911 Change-Id: Id04e33537242441d80b9ec205960e65449af19ea
2020-09-14Using DoAll am: 49aee802dc am: 52c788785b am: f6fc2d2dfa am: a0cff5b8fe am: ↵Haibo Huang
877e27e50b Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1424778 Change-Id: I309981bff78f7ff3d6c4d5179805cd9e492e0179
2020-09-14Using DoAll am: 49aee802dc am: 52c788785b am: f6fc2d2dfa am: a0cff5b8feHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1424778 Change-Id: Icc7b4124f823ea9637e23b916d8a85eff319eee8
2020-09-14Using DoAll am: 49aee802dc am: 52c788785b am: f6fc2d2dfaHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1424778 Change-Id: Ic41dce60378e18e58928facdc88f937b7dc1f733
2020-09-14Using DoAll am: 49aee802dc am: 52c788785bHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1424778 Change-Id: I64fae1cbfe9efe55cf4863984b8d0e217d5ceff0
2020-09-14Using DoAll am: 49aee802dcHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1424778 Change-Id: I4b533a5086ff5b338c9a085fc188291c528cded4
2020-09-11Using DoAllHaibo Huang
The new googletest correctly put DoAll in testing namespace. Change-Id: I21a9a878c1cbe16aed1ef4b39d741d64e0041af6
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: ab13058e48 -s ours am: f815b33913 -s ours am: 7518289b75 -s ours am: dd6ab4fc69 -s ours am skip reason: Change-Id I4de645b429492f2b3c7764ab34cb8e8c7b2010ba with SHA-1 ab4c5bf8a2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbrillo/+/12469912 Change-Id: Ia7ecd6101b6d533a4fcc4098e2915b5c7eb642cc
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: ab13058e48 -s ours am: f815b33913 -s ours am: 7518289b75 -s ours am skip reason: Change-Id I4de645b429492f2b3c7764ab34cb8e8c7b2010ba with SHA-1 ab4c5bf8a2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbrillo/+/12469912 Change-Id: I038f07271240cfd92dc29b196cfc4c841dd7e3cc
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: ab13058e48 -s ours am: f815b33913 -s ours am skip reason: Change-Id I4de645b429492f2b3c7764ab34cb8e8c7b2010ba with SHA-1 ab4c5bf8a2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbrillo/+/12469912 Change-Id: I15e7629b357959b34a827738ff4263fd0ebdaa60
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: ab13058e48 -s ours am skip reason: Change-Id I4de645b429492f2b3c7764ab34cb8e8c7b2010ba with SHA-1 ab4c5bf8a2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbrillo/+/12469912 Change-Id: Idb70d2defece78f51d356689b5b1cd1e74182b86
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: I4de645b429492f2b3c7764ab34cb8e8c7b2010ba Change-Id: I45ebb65f7cf5ef7ccf78f9b3d6e9639129ef8112
2020-07-31libbrillo: replace sigorset with sigismember and sigaddset am: a4cec6c21e ↵Qijiang Fan
am: 2e12f6c0b5 am: b788106e21 am: 68f5677b92 am: 41299bebff Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1371781 Change-Id: I28815a33ec17d2009cd534e2f6d9bf9f9dc3729c
2020-07-31Revert "libbrillo: rename base::JSONReader methods" am: 830b8b038f am: ↵Qijiang Fan
34cc0826b2 am: be53cf4ab2 am: 8f0efce598 am: 6e1303826c Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1371780 Change-Id: Ie20b46f93c98543aae787bb4ccfb8680d3d07177
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 09:47:04 +0000