OSDN Git Service

Merge "Camera2: Add PASSIVE_UNFOCUSED autofocus state." into klp-dev
authorEino-Ville Talvala <etalvala@google.com>
Wed, 25 Sep 2013 19:28:03 +0000 (19:28 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 25 Sep 2013 19:28:03 +0000 (19:28 +0000)
1  2 
api/current.txt
core/java/android/hardware/camera2/CameraMetadata.java
core/java/android/hardware/camera2/CaptureResult.java

diff --cc api/current.txt
Simple merge