commit | 849b836d8e0974f97546eec6168b18bb787b6989 | [log] [tgz] |
---|---|---|
author | Will McVicker <willmcvicker@google.com> | Wed May 03 11:20:48 2023 -0700 |
committer | Will McVicker <willmcvicker@google.com> | Wed May 03 15:43:28 2023 -0700 |
tree | 7ff58d2bf2dc36d167f202db128aa8b16464dd5a | |
parent | 2429cde0c2874dbb3b139f9db164a46b35db5ec6 [diff] | |
parent | bbb96712b839f850f155b82c69dc41f257b42823 [diff] |
Merge aosp/android14-gs-pixel-6.1 into aosp/android-gs-raviole-mainline * aosp/android14-gs-pixel-6.1: kleaf: add support for generic build labels kleaf: kernel_module_deps -> deps nitrous: de-assert dev_wake/pm suspend device when Tx is done Fix kfifo_out return value check Update the paths Kleaf: add bluetooth kernel module for Change-Id: I051db5c6c7a59394e1cda0161fd7c976f0608e24 Signed-off-by: Will McVicker <willmcvicker@google.com>