tree 88a6d3b2e506d786f3d0e2310dc777f03e8d6a2f
parent 1d5c4f4a461e2f2bb5db538b4182fbffcfcfae1a
parent 2247dd0dc60096d1b5a91ccadb5539f0b100c88f
author Igor Murashkin <iam@google.com> 1363913279 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1363913279 +0000

am a97d15e2: Merge "ICameraServiceListener.h: Add STATUS_ENUMERATING enum" into jb-mr2-dev

* commit 'a97d15e2e2f0b317a345d3a6f02df80b8988b1f6':
  ICameraServiceListener.h: Add STATUS_ENUMERATING enum