Merge "Camera2: Add setParameters call"
Merge "Camera2: Minor bugfixes and cleanup"
Merge "Camera2: Improve ANativeWindow handling"
Merge "Camera2: Copy metadata buffers for streaming."
Reduce underruns in screen off, esp. with EQ

Add MonoPipe APIs to specify setpoint.
Use screen state to configure pipe setpoint.
Fix a long-standing bug where pipe sleep time was excessive,
  which interacted poorly with governor and low clock frequencies.
  Now it deducts the elapsed time since last write(),
  which was significant when there was EQ and low clock frequency.

Bug: 6618373
Change-Id: I6f3b0072c2244aeb033ef0795ad164491a164ff5
am 28ed2f93: Reduce underruns in screen off, esp. with EQ

* commit '28ed2f93324988767b5658eba7c1fa781a275183':
  Reduce underruns in screen off, esp. with EQ
am ea5008d8: am 28ed2f93: Reduce underruns in screen off, esp. with EQ

* commit 'ea5008d8abfdf1479b4efa266cdb7c842d168aa9':
  Reduce underruns in screen off, esp. with EQ
Reduce underruns in screen off, esp. with EQ

Add MonoPipe APIs to specify setpoint.
Use screen state to configure pipe setpoint.
Fix a long-standing bug where pipe sleep time was excessive,
  which interacted poorly with governor and low clock frequencies.
  Now it deducts the elapsed time since last write(),
  which was significant when there was EQ and low clock frequency.

Bug: 6618373
Change-Id: I6f3b0072c2244aeb033ef0795ad164491a164ff5
Merge "Fix green or corrupted video frames in the exported movies" into jb-dev
am b7acdfb8: Merge "Fix green or corrupted video frames in the exported movies" into jb-dev

* commit 'b7acdfb8068bf408ed859dfdd441b4a8722eb12a':
  Fix green or corrupted video frames in the exported movies
am 281a5040: am b7acdfb8: Merge "Fix green or corrupted video frames in the exported movies" into jb-dev

* commit '281a5040c92ff652d890b66e3ed9c081da39ee15':
  Fix green or corrupted video frames in the exported movies
stagefright aacenc: Add parentheses in expression with mixed && and ||

This doesn't maintain the exact behaviour, but seems closer to
what the original author probably intended.

This avoids a warning.

Change-Id: I191292faa0a25f715f2b7d46ec770827e2ac0b7b
am 93eb01fd: stagefright aacenc: Add parentheses in expression with mixed && and ||

* commit '93eb01fd39e31b7532932f60828abf11a494fb8f':
  stagefright aacenc: Add parentheses in expression with mixed && and ||
merge in jb-release history after reset to jb-dev
Reconcile with jb-release

Change-Id: Id132825de97a186047a6189a92abde9f5c087a5a
am 7f9b2192: Reconcile with jb-release

* commit '7f9b21922e176f0d28a0932b3e402dc2f7edafbd':
  Reduce underruns in screen off, esp. with EQ
Revert "Added some informational log messages to track down ANR related issues"

This reverts commit c558fa89016ba9583049b84dc57e66a913cabde8.

related-to-bug: 6565826
Add audio watchdog thread

Change-Id: I4ed62087bd6554179abb8258d2da606050e762c0
Merge "Revert "Added some informational log messages to track down ANR related issues"" into jb-dev
stagefright aacenc: Move system headers before local headers

This avoids issues with the encoder's own definition of __inline,
which conflicts with headers brought in by string.h in glibc.

Change-Id: I9e3fbf8d892529940ea67a46e67a9abe71d9c5fa