am bdd7193d: am eccfd929: Merge "Test to measure UDP roundtrip time between two devices on the same network." into jb-mr1-dev

* commit 'bdd7193dea2b85e8c46cb21a7fbcf433e08ad15d':
  Test to measure UDP roundtrip time between two devices on the same network.
am 73ad84eb: am 3a1d5240: Merge "Fix retries when server doesn\'t support range requests." into jb-mr1-dev

* commit '73ad84ebb8fb31fbf91c3ab0476f3a9b3c43ad57':
  Fix retries when server doesn't support range requests.
am cb4d650a: am eb941f9a: Merge "Camera2: Factor out Camera2Client::Parameters" into jb-mr1-dev

* commit 'cb4d650a79d49f19e9271f843c1eaf4382337704':
  Camera2: Factor out Camera2Client::Parameters
am 29d030b7: am ac418756: am 3f9e843d: am 9ce74352: Merge "recordvideo: Sleep while waiting for the encoding to finish"

* commit '29d030b7a42727e1f5633a990adafc21a1c5672e':
  recordvideo: Sleep while waiting for the encoding to finish
am a2cfbc31: am b7b8de88: am 0924dd88: am 2aa37a7d: Merge "recordvideo: Add an option for choosing software encoders"

* commit 'a2cfbc31366b87ce88128c12e1bf030f078fd293':
  recordvideo: Add an option for choosing software encoders
am 526cf47b: am 55fb8470: am bf30787f: am 735d1b92: Merge "avcenc: Don\'t erase the InputBufferInfo before reading info from it"

* commit '526cf47b05291a3641caa8483641fa8d0bebaf6e':
  avcenc: Don't erase the InputBufferInfo before reading info from it
am 22060e5a: am 0a24726a: am 8836f8e0: am 5b15adfe: Merge "MPEG2TSWriter: Read more immediately if an empty buffer is received"

* commit '22060e5a1711d2bf0ddefe98f50060f4b4b32df2':
  MPEG2TSWriter: Read more immediately if an empty buffer is received
am f4500233: am f147b722: Merge "Preliminary support for HDCP as a binder service for wifi display support." into jb-mr1-dev

* commit 'f45002335606a9edb181814fbdf8d0a4e1468a9d':
  Preliminary support for HDCP as a binder service for wifi display support.
am 544b67a0: am d8ee4e56: Merge "Initial checkin of support for acting as a wifi display source" into jb-mr1-dev

* commit '544b67a04b4289aaafa852cbab54abf1f3d6a5bf':
  Initial checkin of support for acting as a wifi display source
am d58522bb: am 2f9a4410: Merge "Fix wifi display shutdown deadlock." into jb-mr1-dev

* commit 'd58522bbd87cd09c8e7953a992a3b97f6ca7f30f':
  Fix wifi display shutdown deadlock.
am 7016bf8e: am 6524b7e1: Merge "Camera2: Factor out FrameProcessor." into jb-mr1-dev

* commit '7016bf8e8741467428a64fd73a7036a60c67b5d7':
  Camera2: Factor out FrameProcessor.
am fd7e92e8: am 682d5593: Merge "Optionally log the transport stream transmitted to the sink." into jb-mr1-dev

* commit 'fd7e92e8643169ac9ff8a2b18dc4ef9f7cf8820b':
  Optionally log the transport stream transmitted to the sink.
am 3b30e72d: am 546436a4: Merge "Transmit frames at a higher frame rate for smoother updates, increase" into jb-mr1-dev

* commit '3b30e72d5013cd89bff20852e9ff55eb0f5d6ad9':
  Transmit frames at a higher frame rate for smoother updates, increase
am a9e6f9d5: am 86b1961a: Merge "Prepare for transmitting audio through AudioSource." into jb-mr1-dev

* commit 'a9e6f9d5542382f66802fb251c1f2562b3174aa0':
  Prepare for transmitting audio through AudioSource.
am 18246bad: am 5f00501d: Merge changes I7bef5694,Id38e2a52 into jb-mr1-dev

* commit '18246badacee54f5ea6836576baca44ccf12f4e9':
  Camera2: Move preview callback processing to its own thread.
  Camera2: Move still capture processing to separate thread.
am 38f910bd: am 23466a95: Merge "Camera2: Require 2 JPEG thumbnail resolutions." into jb-mr1-dev

* commit '38f910bdfa1fb0665261eb60e0afdb4986c8934f':
  Camera2: Require 2 JPEG thumbnail resolutions.
am 4449d1cd: am cba53fbd: audio effects: fix bug in sample rate control.

* commit '4449d1cd962dd6fb0c25d100d2a08b0bb18f05c8':
  audio effects: fix bug in sample rate control.
am c9beb01c: am b9cba9b7: Merge "Move libnbaio out of AudioFlinger" into jb-mr1-dev

* commit 'c9beb01c800e6326051aee52a00659288c25c6eb':
  Move libnbaio out of AudioFlinger
am 27a78751: am 5dcc2c98: Merge "Only run the wifi display RTSP server on demand, and only on the wifi direct" into jb-mr1-dev

* commit '27a787512ff3f9a7ba200bc53f8c688692995748':
  Only run the wifi display RTSP server on demand, and only on the wifi direct
am b5720b1f: am c9936c72: Merge "Remove dead code" into jb-mr1-dev

* commit 'b5720b1ff9262419cd331e56c75a60b291bc7694':
  Remove dead code