am 8ee52c06: am 67c64ca6: manta: charger: do not blank display on startup

* commit '8ee52c069fabfc7aea8d4c00be2b4716f204e9f3':
  manta: charger: do not blank display on startup
am a86560ca: am 8e6867d0: am cf701105: manta: update kernel prebuilt

* commit 'a86560caf997bf4c5e72cd021f9f6b5ec3c50192':
  manta: update kernel prebuilt
am 30b751c4: am 8ee52c06: am 67c64ca6: manta: charger: do not blank display on startup

* commit '30b751c444c0e4e352c427678ca038f405bc678c':
  manta: charger: do not blank display on startup
merge in jb-mr1-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Add missing 32kHz rate in list of supported sample rates.

Bug 7336626

Change-Id: I48ac88436670bce1e9d036725e4135f4f80071ae
Added missing audio encoder capabilities

o The capability of the aac audio encoder was not correctly set.
o The amrwb audio encoder was missing
o change the default aac encoder setting for camcorder apps to 44100

o related-to-bug: 6971073

Change-Id: Iedb08d1d72ea87c6ba19e5c868f1e4d9e9b6fdfc
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ifaa1cb230dda113266b469b30775e49c32065df1
am 7d31522c: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '7d31522c20abff08114eb2bdf5a3a5c2ed305572':
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