tree 22dcd7c03f413c8d14a01c12004619415bfe1418
parent 96ed4ff5ea30a4d28e2450fd44e11e02a477bc8a
parent 7d917ae481baa5843a696325d44b9be6593ab9f8
author Clemenz Portmann <portmannc@google.com> 1537201400 -0700
committer android-build-merger <android-build-merger@google.com> 1537201400 -0700

[automerger] Merge "CameraITS: updates to support openCV 3.2.0 & python 2.7.13" into nougat-cts-dev am: c2d171d4fb am: 43cfa220ab am: 30fa8ef954 am: 335d666d16 am: fae2e73a87 am: 1da7316d3a
am: 7d917ae481

Change-Id: I99a0e76c0d0ab0e748f12d6edbd6565fc80db0f8