tree 1ae75c040a9486c2b46d1f269f94e40f0152f73f
parent af6dd103bd2bb0783b9364c703c2623260496d5c
parent 664802589d4c8953f8b9213135b482719345d7d7
author Jason Noguchi <jnoguchi@google.com> 1357613221 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357613221 -0800

am 66480258: am ba5fd35e: am 7b4e597f: Merge "Adding camera scene mode stress test." into jb-mr1-dev

* commit '664802589d4c8953f8b9213135b482719345d7d7':
  Adding camera scene mode stress test.