tree 3fc64f5f5ea0ce161a14f6ebd2cb7a7d299ad8ec
parent 37b2602761cbfc20f8a36e27eb4cf1b3dfd04e6b
parent 2fba584544e8687b526e3388bf7160b696da1dba
author Igor Murashkin <iam@google.com> 1367430537 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1367430537 +0000

Merge changes I2feda142,I5a95e0be,Ia0c21ef0 into jb-mr2-dev

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