merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I7ba72441de3b5c1aa8264e079a2808450036380a
am 87ed1979: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '87ed1979a2429a465e931ff303d9d53cf93a32ae':
am abc55c69: AudioPolicyManager supports querying active record sources

* commit 'abc55c698301e05a80d7f9394c75abca0b307602':
  AudioPolicyManager supports querying active record sources
am f1761254: am abc55c69: AudioPolicyManager supports querying active record sources

* commit 'f1761254147f61f503d0de1627d9c06b40ef861f':
  AudioPolicyManager supports querying active record sources
Reconcile with jb-mr1-release - do not merge

Change-Id: Ibad2e367e7b86df59e5be5c5db6f2165f07fadb9
am d612ec14: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'd612ec14226d082d246d8448637d15888733a8b9':
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Reconcile with jb-mr1-factory-release - do not merge

Change-Id: Id7a41d6b5c55960694407d194c496766eaefb5d2
am 0e448d32: (-s ours) Reconcile with jb-mr1-factory-release - do not merge

* commit '0e448d3233af3c1cd9b12b38e9c5c88f57c5944f':
am c4c58b24: Merge "Fix native crash" into jb-mr1-dev

* commit 'c4c58b249e02c944f05107398f1d32e3c41e28d1':
  Fix native crash
am 605ca505: am c4c58b24: Merge "Fix native crash" into jb-mr1-dev

* commit '605ca505f43f4e21f6caed855d0c761b8bc2f6d1':
  Fix native crash
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I0ae4d2e710b5380f13fea6f62352842679ed248b
am 8280f934: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '8280f93403bfd5d5e24ebfb969f22e2e5d36f85e':
am b707cf22: Merge "Remote audio submix always has priority for media, only plays media" into jb-mr1-dev

* commit 'b707cf22cf700e28f54c58cba8eeb38538735510':
  Remote audio submix always has priority for media, only plays media
am a1084207: am b707cf22: Merge "Remote audio submix always has priority for media, only plays media" into jb-mr1-dev

* commit 'a1084207a76773319d46cfc1ea7376245b0dd1f3':
  Remote audio submix always has priority for media, only plays media
am 85ad78f2: Initialize mStrategyMutedByDevice

* commit '85ad78f27ca032e90af0f2100659d12c16322c76':
  Initialize mStrategyMutedByDevice
am d4165152: am 85ad78f2: Initialize mStrategyMutedByDevice

* commit 'd41651524bb3d2b9aceec253c0a2e2c5033fee2b':
  Initialize mStrategyMutedByDevice
am aac67317: Merge "audio policy: do not route in call audio to HDMI" into jb-mr1-dev

* commit 'aac673172cd61cd862228a8d41a8f3e7d1e016fd':
  audio policy: do not route in call audio to HDMI