tree 4f1c69edaf4a97136573219ab39a3e61b608a811
parent 366894b544e723b11f591a3071599066d0ada2da
parent 901be0ae33faf8ece17170b0d9d4c4429121b6ab
author Igor Murashkin <iam@google.com> 1379371191 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379371191 -0700

am 901be0ae: Merge "camera2: Update Face class." into klp-dev

* commit '901be0ae33faf8ece17170b0d9d4c4429121b6ab':
  camera2: Update Face class.