OSDN Git Service

am e1c3ff66: Merge "camera_common.h: Add STATUS_ENUMERATING enum" into jb-mr2-dev
authorIgor Murashkin <iam@google.com>
Thu, 21 Mar 2013 23:20:28 +0000 (23:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 21 Mar 2013 23:20:28 +0000 (23:20 +0000)
* commit 'e1c3ff664170ecfb92dab4c2d064c5e3ac3c4fcc':
  camera_common.h: Add STATUS_ENUMERATING enum


Trivial merge