OSDN Git Service

Merge "add isFlashSUpported() to OneCameraCharacteristics, make it work with API...
authorSpike Sprague <spikuru@google.com>
Fri, 23 Jan 2015 22:48:00 +0000 (22:48 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 23 Jan 2015 22:48:01 +0000 (22:48 +0000)
commit410e8a8ea9df5826a943af156cb62992bc5342cb
treeb85ffa0d353577c6235c00ef74e4b2b994e90e78
parentabf1e994d236a65180eecfcb6997003ab12795df
parent88559ffac9fe0d3b00614475b45417e74c7d0678
Merge "add isFlashSUpported() to OneCameraCharacteristics, make it work with API 1 and API 2" into ub-camera-haleakala
src/com/android/camera/CameraActivity.java
src/com/android/camera/CaptureModule.java