tree 2fe1b5beed8607c81b7776c960d6af4a77e6102b
parent 72fa93c70fb2f26a189064356a4cd808ac836039
parent 9964fd37a6d7f30ce96f854f8e67df192f4213be
author Jason Noguchi <jnoguchi@google.com> 1357761549 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357761549 -0800

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

* commit '9964fd37a6d7f30ce96f854f8e67df192f4213be':
  Adding camera scene mode stress test.