Merge "Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC"
am effc08ed: Merge "Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC"

* commit 'effc08ed1eb1d55ca13997ec96f72e40a0866394':
  Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC
am effc08ed: Merge "Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC"

* commit 'effc08ed1eb1d55ca13997ec96f72e40a0866394':
  Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC
am 394b47e5: am effc08ed: Merge "Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC"

* commit '394b47e595fe6677fa85cfa0823170978e6479c8':
  Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC
Camera: don't spam RingBufferConsumer logs in eng builds

Bug: 8969579
Change-Id: Ia51d4072725754fd3b6ca028232a605885376287
Camera: don't spam RingBufferConsumer logs in eng builds

Bug: 8969579
Change-Id: Ia51d4072725754fd3b6ca028232a605885376287
Camera3: Fix fast flexible YUV->NV21 path.

A U by any other name may smell just as sweet, but the color's pretty
awful if you call it a V.

Henceforth they never will be UV.

Bug: 8949720
Change-Id: I4897e93d5a293e576bb1d7ba44d91792b869ad42
Camera3: Fix fast flexible YUV->NV21 path.

A U by any other name may smell just as sweet, but the color's pretty
awful if you call it a V.

Henceforth they never will be UV.

Bug: 8949720
Change-Id: I4897e93d5a293e576bb1d7ba44d91792b869ad42
am 083a08ac: Camera: don\'t spam RingBufferConsumer logs in eng builds

* commit '083a08ac82704fdcc37334a4253ff075f703cc87':
  Camera: don't spam RingBufferConsumer logs in eng builds
am 083a08ac: Camera: don\'t spam RingBufferConsumer logs in eng builds

* commit '083a08ac82704fdcc37334a4253ff075f703cc87':
  Camera: don't spam RingBufferConsumer logs in eng builds
am 0560ecdc: am 083a08ac: Camera: don\'t spam RingBufferConsumer logs in eng builds

* commit '0560ecdc2de3032a3cba2d6e4e00777b5186fd2a':
  Camera: don't spam RingBufferConsumer logs in eng builds
Merge "wifi-display: misc fixes for M3 response parsing" into jb-mr2-dev
Merge "wifi-display: misc fixes for M3 response parsing" into jb-mr2-dev
am 6ed6a2e6: Merge "wifi-display: misc fixes for M3 response parsing" into jb-mr2-dev

* commit '6ed6a2e615e19d8c7c37e2a8ac017c01a74ba876':
  wifi-display: misc fixes for M3 response parsing
am 6ed6a2e6: Merge "wifi-display: misc fixes for M3 response parsing" into jb-mr2-dev

* commit '6ed6a2e615e19d8c7c37e2a8ac017c01a74ba876':
  wifi-display: misc fixes for M3 response parsing
am be06e9fc: am 6ed6a2e6: Merge "wifi-display: misc fixes for M3 response parsing" into jb-mr2-dev

* commit 'be06e9fcdee1b02d29681c73c42a23a530f25d13':
  wifi-display: misc fixes for M3 response parsing
merge in jb-mr2-release history after reset to jb-mr2-dev
Merge "Camera3: Fix fast flexible YUV->NV21 path." into jb-mr2-dev
Merge "Camera3: Fix fast flexible YUV->NV21 path." into jb-mr2-dev
am 7dd801bd: Merge "Camera3: Fix fast flexible YUV->NV21 path." into jb-mr2-dev

* commit '7dd801bd108bff3e897e9e86c5f79f1ab05709d0':
  Camera3: Fix fast flexible YUV->NV21 path.