tree 66a9113582b2d65f5b452fcca8364b9a3d825148
parent b8724867222082ca1e42c5c1060c58c1c9eeca76
parent b59cd66e93f4db4458c10f07fe483512ac62e7b8
author Eino-Ville Talvala <etalvala@google.com> 1487281496 +0000
committer android-build-merger <android-build-merger@google.com> 1487281496 +0000

Merge "camera case fail for testSceneModes"
am: b59cd66e93

Change-Id: I509c87e5b69e4bd26dc97e86063f7a24860e8b3b