OSDN Git Service

am 8916da1b: am e1c3ff66: Merge "camera_common.h: Add STATUS_ENUMERATING enum" into...
authorIgor Murashkin <iam@google.com>
Thu, 21 Mar 2013 23:22:13 +0000 (23:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 21 Mar 2013 23:22:13 +0000 (23:22 +0000)
commit973654b2f6eae01511957dd7567045decf8d7ef7
tree2fcd346f76365477e19b6cca93bb3d224515fc67
parentc9710f15584179a3b738d7541448e54fad602801
parent8916da1bdfe129be10109eb2565887bc84d99dc0
am 8916da1b: am e1c3ff66: Merge "camera_common.h: Add STATUS_ENUMERATING enum" into jb-mr2-dev

* commit '8916da1bdfe129be10109eb2565887bc84d99dc0':
  camera_common.h: Add STATUS_ENUMERATING enum