tree 016676059f35b39b456116847f308c82d38855c6
parent fcdbc82ba32b7ef1c8fbd12944b4aaed70019fb1
parent 46ea9b0b0451a44fc30a646a6e1c4062f0b3d62d
author Igor Murashkin <iam@google.com> 1381185669 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381185669 -0700

am 46ea9b0b: Merge "camera2: Workaround for null FACE_DETECT_MODE crashing" into klp-dev

* commit '46ea9b0b0451a44fc30a646a6e1c4062f0b3d62d':
  camera2: Workaround for null FACE_DETECT_MODE crashing