tree 2331074209a0af8425aa13cf27b7f8145eed5390
parent a285bc130ff1175c60085410f317e90f6443c39b
parent 58ed4d197795147f9f4a202da00b411a6ed53bd2
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