OSDN Git Service

Merge "Fix mode transition jank and stretched video preview" into gb-ub-photos-denali
authorDoris Liu <tianliu@google.com>
Wed, 29 Jan 2014 01:19:50 +0000 (01:19 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 29 Jan 2014 01:19:50 +0000 (01:19 +0000)
commit5e6c3e7840b41685ebd27c40ee243a7ae75e7229
tree319ce899bcd6e32b2ef3d6acedbaec160413a0c8
parent8513f7bbf8ebc2563702b1e35d4894bd8ab7b21f
parent5a367545ab931a308c8d8555ef5a747dc9565caf
Merge "Fix mode transition jank and stretched video preview" into gb-ub-photos-denali
src/com/android/camera/CameraActivity.java
src/com/android/camera/PhotoModule.java
src/com/android/camera/VideoModule.java