OSDN Git Service

Merge changes Ia6300c23,Idd2ae8ad into klp-dev
authorEino-Ville Talvala <etalvala@google.com>
Thu, 12 Sep 2013 00:08:04 +0000 (00:08 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 12 Sep 2013 00:08:04 +0000 (00:08 +0000)
* changes:
  Camera2: Immutable metadata
  Camera2: Listener rework and other API updates

1  2 
api/current.txt

diff --cc api/current.txt
Simple merge