tree 85bc2de66f3c9c7527861894c76e00abd089617a
parent 26e655f397ff2c5a1e397ab6d34f7c88f5fd01de
parent a22c40839e8858d7f210fa1ee53e1d0e593dc65f
author Eino-Ville Talvala <etalvala@google.com> 1487281733 +0000
committer android-build-merger <android-build-merger@google.com> 1487281733 +0000

Merge "camera case fail for testSceneModes" am: b59cd66e93
am: a22c40839e

Change-Id: I52fca667fcd8b8ff501bb145ee49934ba47f92a3