tree 09dd9f89adb07cd67907d0602125adf82b1744ed
parent 5d38fd13d02f665d8c12579b3d952148036edd5f
parent 919f3623e9c471f2cd80ef4f96bbaa43a0ed3b28
author Eino-Ville Talvala <etalvala@google.com> 1336676221 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336676221 -0700

am 919f3623: am 67fb73f5: Merge "Camera: Document expected error codes for start face detect." into jb-dev

* commit '919f3623e9c471f2cd80ef4f96bbaa43a0ed3b28':
  Camera: Document expected error codes for start face detect.