OSDN Git Service

Merge changes I25423a2b,I24680f1a into jb-mr2-dev
authorIgor Murashkin <iam@google.com>
Fri, 1 Mar 2013 02:20:48 +0000 (02:20 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 1 Mar 2013 02:20:51 +0000 (02:20 +0000)
commit3605ab3c02516e4123c39062de301bacc8ea8d9f
tree50493e91ed225e5d29877f5f16cee7dba854b546
parent3eeaca1084ab5908576eefdfdb72c94c22cd15ab
parentba5ca4ee770fa0fe9e14990fd13b23f1010f5c98
Merge changes I25423a2b,I24680f1a into jb-mr2-dev

* changes:
  ProCamera: Add CpuConsumer asynchronous mode support
  Camera: Drop ProCamera connections when a Camera connection happens