tree 59599fd3784e4be3050154a9d281db8eac54e7c7
parent 27974f728512ef47d5d8fe847c75d1f2448180f2
parent 43d0199a5c89d756cb3ac3c0c0fa7afe421be28b
author Igor Murashkin <iam@google.com> 1348473011 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348473011 -0700

am 43d0199a: am 75dce94a: Merge "Camera2: Emit FaceDetection events for all except repeating 0-face frames" into jb-mr1-dev

* commit '43d0199a5c89d756cb3ac3c0c0fa7afe421be28b':
  Camera2: Emit FaceDetection events for all except repeating 0-face frames