OSDN Git Service

Merge "Don't show flash mode option if it's never supported." into gb-ub-photos-denali
authorErin Dahlgren <edahlgren@google.com>
Thu, 20 Feb 2014 03:06:21 +0000 (03:06 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 20 Feb 2014 03:06:22 +0000 (03:06 +0000)
commit791f211c87d0e15e3264086a5ea75ff9066aa177
treea0270fef6d2b3f27a8f8725d8e924d28f32bc5d6
parent0868a09ecd0fb17e63efae3b8b3b694bda32ca20
parente346fb291bd6209b0167d110e15f58576568f99c
Merge "Don't show flash mode option if it's never supported." into gb-ub-photos-denali
src/com/android/camera/CameraActivity.java
src/com/android/camera/app/CameraAppUI.java