OSDN Git Service

am 7a0f7d9f: am d24b0653: Merge changes I2feda142,I5a95e0be,Ia0c21ef0 into jb-mr2-dev
authorIgor Murashkin <iam@google.com>
Wed, 1 May 2013 17:52:49 +0000 (10:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 May 2013 17:52:49 +0000 (10:52 -0700)
commitbfbe189e1052fe44f668efedb8eca6c9b3c9abaf
treed2547411f203decdfb3ae456c7e1bda901fb6775
parentbae8df127ed4b76cce410922e33ce65e525bb405
parent7a0f7d9f6cdad84e4b5f6c6b164874393d541824
am 7a0f7d9f: am d24b0653: Merge changes I2feda142,I5a95e0be,Ia0c21ef0 into jb-mr2-dev

* commit '7a0f7d9f6cdad84e4b5f6c6b164874393d541824':
  Camera3: Add ZSL stream support
  camera: Add new RingBufferConsumer to keep a ring buffer of acquired frames
  Camera3: Add input stream support
services/camera/libcameraservice/Camera2Client.cpp
services/camera/libcameraservice/Camera2Client.h