tree 77589fa4f448fa18c349486f0ae23321ee3ada32
parent 97d5093f721317a3914eb9ba91de961f38c660fd
parent 29a8d5b95b4b872d7596f0c6fcf27a9537202354
author Doris Liu <tianliu@google.com> 1370370341 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1370370341 +0000

Merge "Get new camera activity up to date" into gb-ub-photos-carlsbad