OSDN Git Service

Merge "Enable seamless switching to/from camera2-backed Photo module" into ub-camera...
authorSol Boucher <solb@google.com>
Sat, 16 Aug 2014 00:23:35 +0000 (00:23 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 15 Aug 2014 21:23:40 +0000 (21:23 +0000)
commitf67f64f3b5272d1da317b8eda8e1ea1e46539416
tree8ac58f9f8b1abaa0ded08bb590400c4326eb0585
parenta69d497fd44faab8afe65b748dfede715ea7239f
parent44ce4b26614f85518d548a6750c7a08908ae3596
Merge "Enable seamless switching to/from camera2-backed Photo module" into ub-camera-glacier
src/com/android/camera/CameraActivity.java
src/com/android/camera/settings/CameraSettingsActivity.java