tree 84ee69166607205bca10bde1eee891b2c4e7fd28
parent 3a29ea87c8fdcd45987bcc9cd2b68961ac971d27
parent b08a63931f22a1e934b32e8fb8de9ab4877d5258
author Igor Murashkin <iam@google.com> 1363899509 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1363899510 +0000

Merge changes Ic92924ce,I53107a39 into jb-mr2-dev

* changes:
  Camera2: getSceneMode should return NULL when there are no supported scene modes
  commandStartFaceDetectionL returned the wrong value when face detection is not supported by the HAL. This caused the JNI function to fail since it expected a BAD_VALUE response in that case.