tree dd3389ee0d527f160fb9b9bd3979d04cb78afc63
parent 96c2a83cd7bcb2d01338fa29849d5ac42d0cd088
parent 8d73c043c8c4fe5af8963bbe5c29a47a3dff2677
author Jason Noguchi <jnoguchi@google.com> 1357761231 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357761231 -0800

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

* commit '8d73c043c8c4fe5af8963bbe5c29a47a3dff2677':
  Adding camera scene mode stress test.