tree 144c112e278f20ae3b315197d831bb1893eaebb3
parent 7fc128fef94273b82c66bd636ff7f9fced9a68db
parent ba5fd35e24778c29ad0786d865c2cbdf3a5ab27d
author Jason Noguchi <jnoguchi@google.com> 1357613130 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357613130 -0800

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

* commit 'ba5fd35e24778c29ad0786d865c2cbdf3a5ab27d':
  Adding camera scene mode stress test.