OSDN Git Service

resolved conflicts for merge of e903ae3f to ub-camera-everglades
authorSpike Sprague <spikuru@google.com>
Wed, 30 Apr 2014 00:46:01 +0000 (17:46 -0700)
committerSpike Sprague <spikuru@google.com>
Wed, 30 Apr 2014 00:46:01 +0000 (17:46 -0700)
commit6db1236ecd6b33b4fd1042570cc0d725634a5276
tree64f61038ac7656cbdf8e7519f6068b84c1e9ef0d
parent85cb6f2cbf4d3506a3cf423941f0e25f41f0b280
parente903ae3fc0fc7a98bfc21129ac7ca8ee7ce98fec
resolved conflicts for merge of e903ae3f to ub-camera-everglades

Change-Id: Ic0ea3fdfd5bad7ea3a576c3bc1ab7fddd7b557bc
src/com/android/camera/CameraActivity.java
src/com/android/camera/PhotoModule.java
src/com/android/camera/VideoModule.java