tree c80fe9777c701ab907542675228c01d3430313be
parent 9eb37145df8adfb0bd68e9023342f5c7a4d12d31
parent f22ed280bae246a4b9ce31e5fada68a30f211aed
author Doris Liu <tianliu@google.com> 1369156323 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1369156323 +0000

Merge "Fix camera controls blink on startup" into gb-ub-photos-bryce