OSDN Git Service

am d24b0653: Merge changes I2feda142,I5a95e0be,Ia0c21ef0 into jb-mr2-dev
authorIgor Murashkin <iam@google.com>
Wed, 1 May 2013 17:50:31 +0000 (10:50 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 May 2013 17:50:31 +0000 (10:50 -0700)
commit7a0f7d9f6cdad84e4b5f6c6b164874393d541824
tree6ba180ee41dcd8d4f465d458889451977b25b449
parent6feba7db1144dc383de22a521854d7e983c700fb
parentd24b0653c7620e07e92308c05b41f7df9943f83b
am d24b0653: Merge changes I2feda142,I5a95e0be,Ia0c21ef0 into jb-mr2-dev

* commit 'd24b0653c7620e07e92308c05b41f7df9943f83b':
  Camera3: Add ZSL stream support
  camera: Add new RingBufferConsumer to keep a ring buffer of acquired frames
  Camera3: Add input stream support