OSDN Git Service

Merge "Add back countdown timer" into ub-camera-everglades
authorDoris Liu <tianliu@google.com>
Mon, 19 May 2014 22:25:10 +0000 (22:25 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 19 May 2014 22:25:10 +0000 (22:25 +0000)
1  2 
src/com/android/camera/PhotoModule.java
src/com/android/camera/PhotoUI.java

Simple merge