tree 353e7cd0e17dc4527e68e62442439144a2e8b40d
parent e30d31c4e8439f8fa8647744cee93f1fd8b67407
parent bac8666893ee6d0074db7fa7f995de04598013b1
author Jason Noguchi <jnoguchi@google.com> 1357612827 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1357612828 -0800

Merge "Adding camera scene mode stress test." into jb-mr1-dev