OSDN Git Service

Merge "Get new camera activity up to date" into gb-ub-photos-carlsbad
authorDoris Liu <tianliu@google.com>
Tue, 4 Jun 2013 18:25:41 +0000 (18:25 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 4 Jun 2013 18:25:41 +0000 (18:25 +0000)
commit3d4ff127e4b16e46dab838d7bf9e4f0f4c579027
tree22dddc1cd82e0ec74b410294d440555619f0aa6a
parentc2fd1655a9066f00f598f67a874e4eb2d231fedb
parent2291b6d57e6cbc628c11f108b4a0d8b46de06541
Merge "Get new camera activity up to date" into gb-ub-photos-carlsbad
src/com/android/camera/NewCameraActivity.java
src/com/android/camera/NewPhotoUI.java