am 0328ec08: WFD use of HDCP is now optional.

* commit '0328ec08dc1e90caa2a9e0c4e107d8ddaa74af20':
  WFD use of HDCP is now optional.
am 0328ec08: WFD use of HDCP is now optional.

* commit '0328ec08dc1e90caa2a9e0c4e107d8ddaa74af20':
  WFD use of HDCP is now optional.
am dc5f12a2: am 0328ec08: WFD use of HDCP is now optional.

* commit 'dc5f12a217279d60444fc7243fe89ba4311eea88':
  WFD use of HDCP is now optional.
Merge "Fix a typo that caused the high quality resampler to produce garbage" into jb-mr1-dev
am e384d75b: Merge "Fix a typo that caused the high quality resampler to produce garbage" into jb-mr1-dev

* commit 'e384d75b95b9db30d64a18ada93e070cf07de306':
  Fix a typo that caused the high quality resampler to produce garbage
am e384d75b: Merge "Fix a typo that caused the high quality resampler to produce garbage" into jb-mr1-dev

* commit 'e384d75b95b9db30d64a18ada93e070cf07de306':
  Fix a typo that caused the high quality resampler to produce garbage
am 7f4d5714: am e384d75b: Merge "Fix a typo that caused the high quality resampler to produce garbage" into jb-mr1-dev

* commit '7f4d5714f3f0ab4efaf2d0929a9f984467ef95c7':
  Fix a typo that caused the high quality resampler to produce garbage
merge in jb-mr1-release history after reset to jb-mr1-dev
Increase allowed number of VHQ resamplers to 3

Bug: 7378660
Change-Id: I69e33ca2eb4bb9bd38e2c63df62cd1130d68baf6
stagefright: discard audio at start of capture

The new camcorder start sound is longer than previous one and we
must discard more audio when capture starts.

Ideally, camcorder should use synchronous record start.

Bug 7394330.

Change-Id: I219b4e231aba706776dc7ccc4f1c996eaf22f61a
am c4640c9e: Increase allowed number of VHQ resamplers to 3

* commit 'c4640c9eef850bb1c754bd6b477f1cc8350c6081':
  Increase allowed number of VHQ resamplers to 3
am c4640c9e: Increase allowed number of VHQ resamplers to 3

* commit 'c4640c9eef850bb1c754bd6b477f1cc8350c6081':
  Increase allowed number of VHQ resamplers to 3
am 3aaa4e30: am c4640c9e: Increase allowed number of VHQ resamplers to 3

* commit '3aaa4e30f7663673f3453d3f4671b1119f1802fd':
  Increase allowed number of VHQ resamplers to 3
Merge "stagefright: discard audio at start of capture" into jb-mr1-dev
am 5f6f5b7d: Merge "stagefright: discard audio at start of capture" into jb-mr1-dev

* commit '5f6f5b7d6be5d7882102bf0fc3c691ef8fbe03a1':
  stagefright: discard audio at start of capture
am 5f6f5b7d: Merge "stagefright: discard audio at start of capture" into jb-mr1-dev

* commit '5f6f5b7d6be5d7882102bf0fc3c691ef8fbe03a1':
  stagefright: discard audio at start of capture
am 9cdf6db5: am 5f6f5b7d: Merge "stagefright: discard audio at start of capture" into jb-mr1-dev

* commit '9cdf6db50c0dab30f32291bf00c702ca79132674':
  stagefright: discard audio at start of capture
Camera2: Increase mode update timeout.

During camera startup, it might take a few hundred milliseconds before
requests start to be dequeued by the HAL. Increase the timeout for
synchronizing mode changes and triggers so that triggers near startup
don't time out.

Bug: 6970465
Change-Id: I9dc35378e8018ec18ae31be874fcb094f8a9a0e9
Merge "Camera2: Increase mode update timeout." into jb-mr1-dev
am 6ccc3c34: Merge "Camera2: Increase mode update timeout." into jb-mr1-dev

* commit '6ccc3c343e2751ebfe9fa77215bf84e1a97e38fc':
  Camera2: Increase mode update timeout.