tree b1bf4e9579584cfaee612468d45baf3a77bd7805
parent 45f1f86eb97356b73811fc4d70af437c55a86dd7
parent d090054d5087b02a6a410633c4109d5901c524ba
author Igor Murashkin <iam@google.com> 1366647565 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366647565 -0700

am d090054d: Merge "Fix ProCameraTests to pass on Wolfie, disabling failing tests" into jb-mr2-dev

* commit 'd090054d5087b02a6a410633c4109d5901c524ba':
  Fix ProCameraTests to pass on Wolfie, disabling failing tests