tree c8d34f65d37ca4ed2edee7fa84f0193711c9358c
parent 42537b79565c20a51738b9fb1c9ad5878625276c
parent 82acea1f14282690c84c1b939890ed6c71d5b26a
author Clemenz Portmann <portmannc@google.com> 1521053345 +0000
committer android-build-merger <android-build-merger@google.com> 1521053345 +0000

Merge "Merge "CameraITS: updates to support openCV 3.2.0 & python 2.7.13" into nougat-mr1-cts-dev am: 8d7a3d49cb" into oreo-cts-dev am: eb8df9495d
am: 82acea1f14

Change-Id: I6be0969dca2e539c47f20289794cb8c0be80e8c6