tree 0e75543421006cf43f3098dcc0db48d3cea3cc11
parent e99ac6eba3355e6574407f73c0a24f4aa7056d35
parent 67fb73f5d5eaa089b63018f55f980631c9ba6749
author Eino-Ville Talvala <etalvala@google.com> 1336671923 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336671923 -0700

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

* commit '67fb73f5d5eaa089b63018f55f980631c9ba6749':
  Camera: Document expected error codes for start face detect.