tree 95cf8b952d6fd51f5c3b739471a20b3c9f8748f6
parent bf94f90cdc53136d11d4722616ed032519501732
parent 152b50fda66a1fe2b4ed96ec54da96d10f8ac37c
author Igor Murashkin <iam@google.com> 1363907807 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1363907807 +0000

Merge "camera_common.h: Add STATUS_ENUMERATING enum" into jb-mr2-dev