am 30e5fecf: am 848621d5: Merge "Fix seek in response to OnPrepared() for HLS content" into jb-mr2-dev

* commit '30e5fecf560f50ca692923f355b10f1294ea00e9':
  Fix seek in response to OnPrepared() for HLS content
am 512382e4: Reconcile with jb-mr2-release - do not merge

* commit '512382e404eb125d61725b25210c02abc73f6d62':
Camera3: Fix metadata result not being rewritten after capture

Generally this problem manifested itself as the Frame Count not being set,
which then errored out ProFrameProcessor with a "Success" error.

Change-Id: Ifa927f43d0ce92100651ad3f714099a2f1ec4c2a
am b7c9d61b: Camera3: Fix metadata result not being rewritten after capture

* commit 'b7c9d61b9d398b272c8138a2c6aace069229ac03':
  Camera3: Fix metadata result not being rewritten after capture
am 3ed1f4a4: am b7c9d61b: Camera3: Fix metadata result not being rewritten after capture

* commit '3ed1f4a4b42042e64460fa39ff117d87f45f19bc':
  Camera3: Fix metadata result not being rewritten after capture
Merge "MediaDrm API update" into jb-mr2-dev
Camera3: Fix output stream creation for JPEG streams

Change-Id: Iadf85c103c21614abb1aeb69a832ca01919c2aa5
am a56e1506: Merge "MediaDrm API update" into jb-mr2-dev

* commit 'a56e15065bc45082d913c8c8e71e60692ce8c8f0':
  MediaDrm API update
audioflinger: add effect config status check

Check the result of the effect engine configuration command
and do not attempt to send parameters to, enable, or process
the effect if configuration fails.

Bug 8512027

Change-Id: I8c78a05d79fba36b1a387aa5cf2700612301ac91
am e09f4860: Camera3: Fix output stream creation for JPEG streams

* commit 'e09f486085c7e7f3de329db73ad6bb9899740dbe':
  Camera3: Fix output stream creation for JPEG streams
am 1ef63d1a: am a56e1506: Merge "MediaDrm API update" into jb-mr2-dev

* commit '1ef63d1a6a03d713954acbdb4e4641f53ade1d66':
  MediaDrm API update
am 025403bb: am e09f4860: Camera3: Fix output stream creation for JPEG streams

* commit '025403bb5cd7e021a39414389e5375ac1b5f2b12':
  Camera3: Fix output stream creation for JPEG streams
merge in jb-mr2-release history after reset to jb-mr2-dev
Merge "audioflinger: add effect config status check" into jb-mr2-dev
am a9cbef06: Merge "audioflinger: add effect config status check" into jb-mr2-dev

* commit 'a9cbef06acb2a422474cbf292debc1f31fcf9c44':
  audioflinger: add effect config status check
am 5cc3e735: am a9cbef06: Merge "audioflinger: add effect config status check" into jb-mr2-dev

* commit '5cc3e73537058ce5b42ea27c19a08a73cea64c20':
  audioflinger: add effect config status check
Implement async event callout from drm plugin to Java app

Change-Id: I007f147d693664e777b8758be2bb8a4c7ec0236b
Reconcile with jb-mr2-release - do not merge

Change-Id: Icb6a064ee14714e954177e5110282efe21727ec6
am fb9442ee: Reconcile with jb-mr2-release - do not merge

* commit 'fb9442ee7bdcbd05d64d06d15437c72a51b3f94b':
merge in jb-mr2-release history after reset to jb-mr2-dev