OSDN Git Service

Merge "camera3: Update availableEffects, effectMode tags in frameworks/base."
authorRuben Brunk <rubenbrunk@google.com>
Sat, 18 Jan 2014 00:44:46 +0000 (00:44 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 18 Jan 2014 00:44:46 +0000 (00:44 +0000)
commitc759efb9f3368c5863f62f8a3b7881effda65271
tree917c54898acddd5ab140487a9d46810c5c2fcddb
parentf9e039dd0311b5b43cc9d8722a290a93d7eb67cf
parent5f1dcfe49dfe7b9a4a40482152638af6ca925a6d
Merge "camera3: Update availableEffects, effectMode tags in frameworks/base."
core/java/android/hardware/camera2/CameraCharacteristics.java
core/java/android/hardware/camera2/CaptureRequest.java