Merge "Add missing 32kHz rate in list of supported sample rates." into jb-mr1-dev
am 1b7c663e: Merge "Add missing 32kHz rate in list of supported sample rates." into jb-mr1-dev

* commit '1b7c663e0837a9e5a4b9eeeed491ba6e9fbbf882':
  Add missing 32kHz rate in list of supported sample rates.
am baaefe43: am 1b7c663e: Merge "Add missing 32kHz rate in list of supported sample rates." into jb-mr1-dev

* commit 'baaefe43b7bbc4feb2a560d49e577ab32c0904b6':
  Add missing 32kHz rate in list of supported sample rates.
am 64708575: am baaefe43: am 1b7c663e: Merge "Add missing 32kHz rate in list of supported sample rates." into jb-mr1-dev

* commit '64708575b9f649b2959f4acfcedd8a4baf3ec683':
  Add missing 32kHz rate in list of supported sample rates.
manta: wlan: Turn ON FW watchdog to catch FW hang

Bug: 7324935, 7182748

Change-Id: I950717051b98014bf296a94b5bff1802bb09b79a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Merge "manta: wlan: Turn ON FW watchdog to catch FW hang" into jb-mr1-dev
am 6f185095: Merge "manta: wlan: Turn ON FW watchdog to catch FW hang" into jb-mr1-dev

* commit '6f1850952ea55732154ce3a6ee7b2b268bc53f83':
  manta: wlan: Turn ON FW watchdog to catch FW hang
am 81bfb11d: am 6f185095: Merge "manta: wlan: Turn ON FW watchdog to catch FW hang" into jb-mr1-dev

* commit '81bfb11de8339cabef3ba4cae374fb169813666a':
  manta: wlan: Turn ON FW watchdog to catch FW hang
am 1788f367: am 81bfb11d: am 6f185095: Merge "manta: wlan: Turn ON FW watchdog to catch FW hang" into jb-mr1-dev

* commit '1788f36778b627166ec8a5507dc799530ea71911':
  manta: wlan: Turn ON FW watchdog to catch FW hang
manta: wifi.on use average power including sleep mode

Avoid overstating wifi power usage.

Bug: 7245627
Change-Id: Iea84891f0673406ffce633dfbc5efd168f27735f
Merge "manta: wifi.on use average power including sleep mode" into jb-mr1-dev
am 1d5d3ebe: Merge "manta: wifi.on use average power including sleep mode" into jb-mr1-dev

* commit '1d5d3ebe318778712fc606601a8e2cf62ca53485':
  manta: wifi.on use average power including sleep mode
am 24cb5cb8: am 1d5d3ebe: Merge "manta: wifi.on use average power including sleep mode" into jb-mr1-dev

* commit '24cb5cb82972f75b0ae8aa3c3c9600b7c327b958':
  manta: wifi.on use average power including sleep mode
am ae8777d3: am 24cb5cb8: am 1d5d3ebe: Merge "manta: wifi.on use average power including sleep mode" into jb-mr1-dev

* commit 'ae8777d33bd6eeabf516b827baa4862cf58090d4':
  manta: wifi.on use average power including sleep mode
manta: update kernel prebuilt

d9dc561 ARM: exynos: manta: add keyreset device for charger mode
1f10d7e input: keyreset: add support for reset after timeout
3dcf1c9 input: keyreset: move init to subsys to be ready early
80ecaae input: keyreset: process pressed keys at init
ef1eefb ARM: exynos: manta: initialize power key early
2994516 input: misc: gpio_event: register driver early, at subsys
aa70cb3 WiFi: Change sleep GPIO default setting

Change-Id: I5919c9961291a7d0889c6aa76806f573eb300da5
Signed-off-by: Dima Zavin <dima@android.com>
am 39944fba: manta: update kernel prebuilt

* commit '39944fba140287e07c0593a6d1e0753cd4954fd6':
  manta: update kernel prebuilt
Add missing 32kHz rate in list of supported sample rates.

Bug 7336626

Change-Id: I48ac88436670bce1e9d036725e4135f4f80071ae
manta: wifi.on use average power including sleep mode

Avoid overstating wifi power usage.

Bug: 7245627
Change-Id: Iea84891f0673406ffce633dfbc5efd168f27735f
manta: update prebuilt kernel for FACTORY ROM

373bcb5 ARM: exynos: manta: add keyreset device for charger mode
391c6d2 input: keyreset: add support for reset after timeout
0d7755a input: keyreset: move init to subsys to be ready early
1d34527 input: keyreset: process pressed keys at init
2f47f59 ARM: exynos: manta: initialize power key early
9ae32ca input: misc: gpio_event: register driver early, at subsys

Change-Id: I434a911301feb5be069deffde9ba3390b1c37a2c
Signed-off-by: Dima Zavin <dima@android.com>
Merge "Added missing audio encoder capabilities" into jb-mr1-dev