blob: 6ffa7df8136dcaafb70910fd8e3742940fb3d1db [file] [log] [blame]
drops {
android_build_drop {
<<<<<<< HEAD (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
build_id: "7046903"
=======
build_id: "7079298"
>>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
target: "kernel_bonito"
source_file: "synaptics_dsx_rmi_dev.ko"
}
dest_file: "synaptics_dsx_rmi_dev.ko"
<<<<<<< HEAD (3bc70b Snap for 7050341 from b0c865e62af54d3ea1c268682eaabb4ce959b7)
version: "Linux version 4.9.237-g955cdf7a85f3-ab7046903 (android-build@abfarm387) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Tue Dec 22 20:14:48 UTC 2020"
=======
version: "Linux version 4.9.237-gbd4db4f9f99f-ab7079298 (android-build@abfarm-east4-081) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #0 SMP PREEMPT Wed Jan 13 10:25:20 UTC 2021"
>>>>>>> CHANGE (c1a193 bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ])
version_group: "kernel-and-modules"
git_project: "device/google/bonito-kernel"
}