OSDN Git Service

Merge "fixing intent ui controls visibility" into gb-ub-photos-denali
authorSpike Sprague <spikuru@google.com>
Mon, 10 Feb 2014 22:31:00 +0000 (22:31 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 10 Feb 2014 22:31:00 +0000 (22:31 +0000)
commit4108d9ace2a0f40ad28f8d6530a174f1a0cffe95
tree9b168702db3ece48efb3b0de4cdb4d55f52f65be
parenta706c94d2c96f47927cc3026fcf9d1c42c01489b
parent15690d02da08bda74ed63f260b70076801bf91bf
Merge "fixing intent ui controls visibility" into gb-ub-photos-denali
src/com/android/camera/PhotoModule.java
src/com/android/camera/VideoModule.java
src/com/android/camera/app/CameraAppUI.java