am 26f9aacc: require bootloader LA03

* commit '26f9aacc85305b20559e348109a3be3350704985':
  require bootloader LA03
am 26f9aacc: require bootloader LA03

* commit '26f9aacc85305b20559e348109a3be3350704985':
  require bootloader LA03
am 40fab732: am 26f9aacc: require bootloader LA03

* commit '40fab73278a174a3d2cb4f3a4abd67820d186cf8':
  require bootloader LA03
am a20a1dd5: am 40fab732: am 26f9aacc: require bootloader LA03

* commit 'a20a1dd52fb2b7757b75d54c66a9eb50d7806ee7':
  require bootloader LA03
merge in ics-mr1-release history after reset to ics-mr1
audio: support multiple output PCMs

Change-Id: I5179699b22224473bd158e90f864e4e73895b5dc
Merge "audio: support multiple output PCMs" into ics-mr1
am c2ff429f: Merge "audio: support multiple output PCMs" into ics-mr1

* commit 'c2ff429f7bea57e0d774544ec9aeac4c25497317':
  audio: support multiple output PCMs
am c2ff429f: Merge "audio: support multiple output PCMs" into ics-mr1

* commit 'c2ff429f7bea57e0d774544ec9aeac4c25497317':
  audio: support multiple output PCMs
tuna: prebuilt kernel -- DO NOT MERGE

ec29a34 mmc: omap_hsmmc: Prevent calling mmc_host_lazy_disable() on suspend path

Change-Id: I85bb2002f52012d8f11ab4da9c63a8aab158c146
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
am 400a1718: tuna: prebuilt kernel -- DO NOT MERGE

* commit '400a17182e7c28ef2ff7697889689bdbcb87af33':
  tuna: prebuilt kernel -- DO NOT MERGE
am 400a1718: tuna: prebuilt kernel -- DO NOT MERGE

* commit '400a17182e7c28ef2ff7697889689bdbcb87af33':
  tuna: prebuilt kernel -- DO NOT MERGE
resolved conflicts for merge of 8c61349a to master

Change-Id: Id432e901f8107a00a7f371e5882b1290a1154961
am 68c6ce58: resolved conflicts for merge of 8c61349a to master

* commit '68c6ce584e307075f37f18e5b9c817f3c7edc0bd':
  audio: support multiple output PCMs
am b5aeee50: (-s ours) am 400a1718: tuna: prebuilt kernel -- DO NOT MERGE

* commit 'b5aeee50f7681fd121637614ac1719b84d03ae09':
  tuna: prebuilt kernel -- DO NOT MERGE
am 53e7400f: am b5aeee50: (-s ours) am 400a1718: tuna: prebuilt kernel -- DO NOT MERGE

* commit '53e7400f49ef3fd64dea76cd751cef8cfbfd5fcb':
  tuna: prebuilt kernel -- DO NOT MERGE
Fix incorrect min bit rate setting for AMR NB audio recording

Not sure why we did not do this the first day, and the min bit rate recording works just fine.

o related-to-bug: 5924354

Change-Id: I7b01703f84861df03caf7a1f9e538eab679056ee
merge in ics-mr1-release history after reset to ics-mr1
Merge "Fix incorrect min bit rate setting for AMR NB audio recording"
am 56db4d12: Merge "Fix incorrect min bit rate setting for AMR NB audio recording"

* commit '56db4d12411d0d6c11392a3a4c9ab3590d470e0f':
  Fix incorrect min bit rate setting for AMR NB audio recording