tree a4061315020a26362f1fcb90283b8068e99f5b78
parent 715dfe3f08dd76fc4c00b87b4f99c9e9e05cfc1d
parent 8642a4d7cdb0434798536849ddbd47ecfc0aea30
author Linux Build Service Account <lnxbuild@localhost> 1415171465 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> 1415171465 -0800

Merge "TestingCamera: Add CAC mode"