summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
11 daysMerge "Migrate Test Targets to New Android Ownership Model" into mainHEADmastermainTreehugger Robot
2024-02-02Migrate Test Targets to New Android Ownership ModelAditya Choudhary
This CL is created as a best effort to migrate test targets to the new Android ownership model. It is based on historical data from repository history and insights from git blame. Given the nature of this effort, there may be instances of incorrect attribution. If you find incorrect or unnecessary attribution in this CL, please create a new CL to fix that. For detailed guidelines and further information on the migration please refer to the link below, go/new-android-ownership-model Bug: 304529413 Test: N/A Change-Id: I3fc67a070c1952c6900aed5bd95ea2cfc681e0df
2023-11-14elfutils: refactor transitive dependencies am: 4fa44e4465 am: 4cec1c501e am: ↵Aleksei Vetrov
31ea2ed8c1 Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2826077 Change-Id: I526bbe1ce59051400b5021110de1f49f44ff5dbe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14elfutils: refactor transitive dependencies am: 4fa44e4465 am: d3bc17b984 am: ↵Aleksei Vetrov
97305bb8c6 Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2826077 Change-Id: Ic6c6b5cba28e5d50b892823f75a98bfdd6161548 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14elfutils: refactor transitive dependencies am: 4fa44e4465 am: 4cec1c501eAleksei Vetrov
Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2826077 Change-Id: I092d01e68b86a20a871d0d4ec1377a6dac78c560 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14elfutils: refactor transitive dependencies am: 4fa44e4465 am: d3bc17b984Aleksei Vetrov
Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2826077 Change-Id: I28241270d8bf4e0fc88ad3826e390dedaf3b1ef7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14elfutils: refactor transitive dependencies am: 4fa44e4465Aleksei Vetrov
Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2826077 Change-Id: I31dd506413a46b6b253c628a8d34e70894c1b67f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14elfutils: refactor transitive dependencies am: 4fa44e4465Aleksei Vetrov
Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2826077 Change-Id: I09da5604c84e84e6096574805e5b624f937d20cf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14elfutils: refactor transitive dependenciesAleksei Vetrov
Soong doesn't have propagation for static library dependencies. Add "elfutils_transitive_defaults" to have "static_libs" that are applied to all static libraries that use elfutils. For now this provides "libz", which is needed by "elfutils". This have to be included explicitly by all elfutils users. Bug: 169779783 Bug: 309972007 Change-Id: I17d97ed3496ff42fda215376efcfe12d691dc40b Signed-off-by: Aleksei Vetrov <vvvvvv@google.com>
2023-10-30contexthub-nano: Include headers for 4.4 kernels am: 2ad8a91c21 am: ↵Nolen Johnson
bce5fe70a9 am: 087d364a9a Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2781288 Change-Id: Ia29d39f6280f053cbede96cdd68e6348d58d84f7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30contexthub-nano: Include headers for 4.4 kernels am: 2ad8a91c21 am: ↵Nolen Johnson
b8cb1a2a4c am: 0ed308dfff Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2781288 Change-Id: Ice3a00a742a53f1288096f535a7b0e281a1b13d6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30contexthub-nano: Include headers for 4.4 kernels am: 2ad8a91c21 am: bce5fe70a9Nolen Johnson
Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2781288 Change-Id: I173df64bd57991f2c8639fee24fbf23166689c2f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30contexthub-nano: Include headers for 4.4 kernels am: 2ad8a91c21Nolen Johnson
Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2781288 Change-Id: I23102557d9510085eaee9db0b2e7205d9d6c882e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30contexthub-nano: Include headers for 4.4 kernels am: 2ad8a91c21 am: b8cb1a2a4cNolen Johnson
Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2781288 Change-Id: I56d26a9b1bdd34a4dbd9737acec474718cf092e7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30contexthub-nano: Include headers for 4.4 kernels am: 2ad8a91c21Nolen Johnson
Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2781288 Change-Id: I9b8f0296be37b0f0568ab1091046dc0628b4a24d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26contexthub-nano: Include headers for 4.4 kernelsNolen Johnson
* Still builds fine on 3.18 as well (not that we care). * Relevant error snippet: ``` device/google/contexthub/contexthubhal/NanohubHidlAdapter.cpp device/google/contexthub/contexthubhal/NanohubHidlAdapter.cpp:527:25: error: use of undeclared identifier 'O_RDONLY' int fd = open(file, O_RDONLY); ^ 1 error generated. 17:51:51 ninja failed with: exit status 1 ``` Change-Id: I7ec26215feb5b0065987168222311f699472c466
2023-08-17Use String8/16 c_str am: 441ceef0d3 am: ca94928e5e am: 14d34dd8ce am: ↵Tomasz Wasilczyk
77cc3e43f2 am: bec4a9c33f Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2705756 Change-Id: I82e4c44bbc5156aed7b6f20798b3fdeb1a474afa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17Use String8/16 c_str am: 441ceef0d3 am: ca94928e5e am: 14d34dd8ce am: 77cc3e43f2Tomasz Wasilczyk
Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2705756 Change-Id: I3a632267b319cbe584249968fd43f1bd8b9bac3d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17Use String8/16 c_str am: 441ceef0d3 am: ca94928e5e am: 14d34dd8ceTomasz Wasilczyk
Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2705756 Change-Id: I0f2c1610a6aa7619cd421343b5f30520aabccb88 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17Use String8/16 c_str am: 441ceef0d3 am: ca94928e5eTomasz Wasilczyk
Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2705756 Change-Id: I9aa87aed26524f3bf237d98f232a741c43417b5d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17Use String8/16 c_str am: 441ceef0d3Tomasz Wasilczyk
Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2705756 Change-Id: Ic0d225fb59269e0c8af5d66d77c81aebcfe3d3cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11Use String8/16 c_strTomasz Wasilczyk
Bug: 295394788 Test: make checkbuild Change-Id: I0acedeb1ec80e75f056792bb0a6a4eb4e957dc57
2022-08-17[automerger skipped] DO NOT MERGE - Merge Android 13 am: 6baf6155b7 -s ours ↵android-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_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devXin Li
am: 2ed82b529a -s ours am: 3975dfa4e5 -s ours am: 198d62a504 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2185744 Change-Id: I0b091af43131d6e776d0887f7add04fb40c27dd6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17[automerger skipped] DO NOT MERGE - Merge Android 13 am: 6baf6155b7 -s ours ↵android-u-beta-1-gplmain-16k-with-phonesXin Li
am: 2ed82b529a -s ours am: 3975dfa4e5 -s ours am skip reason: Merged-In I0ff1481d841f5d49346264aa7140ec097d2718ad with SHA-1 a4acd5830b is already in history Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2185744 Change-Id: I74e12013faa42ba62083bf4fc1543f7d0ee35335 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] DO NOT MERGE - Merge Android 13 am: 6baf6155b7 -s ours ↵Xin Li
am: 2ed82b529a -s ours am skip reason: Merged-In I0ff1481d841f5d49346264aa7140ec097d2718ad with SHA-1 a4acd5830b is already in history Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2185744 Change-Id: Ie145df9723968e6cbe6c3e0e6ed51ace8325ffcb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] DO NOT MERGE - Merge Android 13 am: 6baf6155b7 -s oursXin Li
am skip reason: Merged-In I0ff1481d841f5d49346264aa7140ec097d2718ad with SHA-1 a4acd5830b is already in history Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2185744 Change-Id: I257fcf807403eda2e123036c39a7ee84e4a94228 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15DO NOT MERGE - Merge Android 13main-16kXin Li
Bug: 242648940 Merged-In: I0ff1481d841f5d49346264aa7140ec097d2718ad Change-Id: I50c1cc34f9ffa312c08a2ab294f698dee6578049
2022-06-30[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
26514c87e1 -s ours am: dd56d7dcf4 -s ours am: 6b16f81d98 -s ours am: 6d1edb00a1 -s ours am skip reason: Merged-In I0ff1481d841f5d49346264aa7140ec097d2718ad with SHA-1 a4acd5830b is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/contexthub/+/19094398 Change-Id: I95434ad32b2842c8138b193114f65b69e6517043 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
26514c87e1 -s ours am: dd56d7dcf4 -s ours am: 6b16f81d98 -s ours am skip reason: Merged-In I0ff1481d841f5d49346264aa7140ec097d2718ad with SHA-1 a4acd5830b is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/contexthub/+/19094398 Change-Id: I3ceeb93a85f5c2e04beb1ee3c5d2f51ca369c317 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
26514c87e1 -s ours am: dd56d7dcf4 -s ours am skip reason: Merged-In I0ff1481d841f5d49346264aa7140ec097d2718ad with SHA-1 a4acd5830b is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/contexthub/+/19094398 Change-Id: I0cc6752982532f33b5816aa400f1692f6e840411 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
26514c87e1 -s ours am skip reason: Merged-In I0ff1481d841f5d49346264aa7140ec097d2718ad with SHA-1 a4acd5830b is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/contexthub/+/19094398 Change-Id: Ie73dacd5eeb305cac6e770434f8983a860939db2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27Merge tm-dev-plus-aosp-without-vendor@8763363temp_sam_242648940Xin Li
Bug: 236760014 Merged-In: I0ff1481d841f5d49346264aa7140ec097d2718ad Change-Id: I58f3cc16d49d5b99e4e907f799240dcaed5b575a
2022-06-23Merge "nanotool: Remove cpp_std: c++11" am: 88d36c6e33 am: e948b50a4e am: ↵Treehugger Robot
d2d82174cd am: 87d11f994a am: 5efc6e2210 Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2133995 Change-Id: I96fd787e465bc7bcaeab8428c962c87948c8e5b8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23Merge "nanotool: Remove cpp_std: c++11" am: 88d36c6e33 am: e948b50a4e am: ↵Treehugger Robot
d2d82174cd am: 87d11f994a Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2133995 Change-Id: I6b0ff53e90ac3821e44a05cb988bf4bbdaa0b5e0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23Merge "nanotool: Remove cpp_std: c++11" am: 88d36c6e33 am: e948b50a4e am: ↵Treehugger Robot
d2d82174cd Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2133995 Change-Id: I79e49815ce5781da777dab843f9d04a6afbc97d6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23Merge "nanotool: Remove cpp_std: c++11" am: 88d36c6e33 am: e948b50a4eTreehugger Robot
Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2133995 Change-Id: I1b73c6ba18bcd5b3e2208cb59f49e41046faeaf9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23Merge "nanotool: Remove cpp_std: c++11" am: 88d36c6e33Treehugger Robot
Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2133995 Change-Id: Id4ba147de60fa5e84060f8e26490b0316e9b92ee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23Merge "nanotool: Remove cpp_std: c++11"Treehugger Robot
2022-06-22nanotool: Remove cpp_std: c++11Dmitry Shmidt
Bug: 236877636 Test: make nanotool -j24 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Change-Id: I0ff1481d841f5d49346264aa7140ec097d2718ad
2022-03-09[automerger skipped] Merge Android 12L am: dcd1fc0da4 -s ours am: 342eeeb427 ↵Xin Li
-s ours am: f18f6a2fe8 -s ours am: c4f3bcb462 -s ours am: 23569ea3ef -s ours am skip reason: Merged-In I7492a7ad83058fcf9028a9ac18b2424e7cf10b4d with SHA-1 e1e4037be7 is already in history Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2012789 Change-Id: I7f59194a96467282ec752930e671b976f5d7669e
2022-03-09[automerger skipped] Merge Android 12L am: dcd1fc0da4 -s ours am: 342eeeb427 ↵Xin Li
-s ours am: f18f6a2fe8 -s ours am: c4f3bcb462 -s ours am skip reason: Merged-In I7492a7ad83058fcf9028a9ac18b2424e7cf10b4d with SHA-1 e1e4037be7 is already in history Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2012789 Change-Id: Ie58e0d5c19afe75c4f98afdc88265a02c2ff507e
2022-03-09[automerger skipped] Merge Android 12L am: dcd1fc0da4 -s ours am: 342eeeb427 ↵aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_sch_331113000aml_sch_331111000aml_net_331910030aml_net_331812010aml_net_331710000aml_net_331610000aml_net_331412000aml_net_331313030aml_net_331313010aml_net_331110020aml_net_331011030aml_net_330910010aml_net_330811010aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_art_331813100aml_art_331813010aml_art_331711080aml_art_331612010aml_art_331413030aml_art_331314010aml_art_331113000aml_art_331012050android13-mainline-tzdata4-releaseandroid13-mainline-scheduling-releaseandroid13-mainline-networking-releaseandroid13-mainline-art-releaseandroid13-mainline-appsearch-releaseaml_tz4_332714010Xin Li
-s ours am: f18f6a2fe8 -s ours am: c4f3bcb462 -s ours am skip reason: Merged-In I7492a7ad83058fcf9028a9ac18b2424e7cf10b4d with SHA-1 e1e4037be7 is already in history Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2012789 Change-Id: I75b5a03a7b62e9bfd037045120a6f31cee065092
2022-03-09[automerger skipped] Merge Android 12L am: dcd1fc0da4 -s ours am: 342eeeb427 ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-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_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_r32aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-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-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseXin Li
-s ours am: f18f6a2fe8 -s ours am skip reason: Merged-In I7492a7ad83058fcf9028a9ac18b2424e7cf10b4d with SHA-1 e1e4037be7 is already in history Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2012789 Change-Id: Id125e17200ade6f618c8e3b9bbd373262895c98c
2022-03-08[automerger skipped] Merge Android 12L am: dcd1fc0da4 -s ours am: 342eeeb427 ↵Xin Li
-s ours am skip reason: Merged-In I7492a7ad83058fcf9028a9ac18b2424e7cf10b4d with SHA-1 e1e4037be7 is already in history Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2012789 Change-Id: Ia739f0410821c84991bca495293c394b757b88e3
2022-03-08[automerger skipped] Merge Android 12L am: dcd1fc0da4 -s oursXin Li
am skip reason: Merged-In I7492a7ad83058fcf9028a9ac18b2424e7cf10b4d with SHA-1 e1e4037be7 is already in history Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2012789 Change-Id: Ia183bae59fd491740610f0ad2e91934901921cb1
2022-03-08Merge Android 12LXin Li
Bug: 222710654 Merged-In: I7492a7ad83058fcf9028a9ac18b2424e7cf10b4d Change-Id: I5e90fb5ed9247aa7d3df4507a94fd38b2f4c7f13
2022-02-14[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: ↵Xin Li
e1e4037be7 -s ours am: d1942657e1 -s ours am skip reason: Merged-In Ib1a08155c033fe93dcb2d3af430dadf3a732b7da with SHA-1 61b465491f is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/contexthub/+/16845009 Change-Id: Ic167e33c043f2d58a7cf825072ac3b155225392a
2022-02-14[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: ↵Xin Li
e1e4037be7 -s ours am skip reason: Merged-In Ib1a08155c033fe93dcb2d3af430dadf3a732b7da with SHA-1 61b465491f is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/contexthub/+/16845009 Change-Id: I81c4660a526418a12c675c018a6a1359f8ac02f8
2022-02-11Merge sc-v2-dev-plus-aosp-without-vendor@8084891sam_222710654Xin Li
Bug: 214455710 Merged-In: Ib1a08155c033fe93dcb2d3af430dadf3a732b7da Change-Id: I7492a7ad83058fcf9028a9ac18b2424e7cf10b4d
2022-01-27firmware: Fix compilation due to lack of assert.h am: 78c7d3a84e am: ↵Dmitry Shmidt
b7bea74b83 am: 77bbc5c2f2 am: 80ef23782f Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/1960337 Change-Id: I6794a7f902486436c8b13de7f1680be18df078e2
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 06:16:28 +0000