OSDN Git Service

am 1c950cc2: (-s ours) am 2be61f66: am dfca664a: am 831da613: Merge "Set camera contr...
authorErin Dahlgren <edahlgren@google.com>
Wed, 30 Apr 2014 18:14:49 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:49 +0000 (18:14 +0000)
commit3e7c283119cb14f6c3494b26a373a14e2f241b58
tree3804e07840427a842ef1bdc750bffe2239123c26
parent997afb2348284c577a4a803dbb2643107e414149
parent1c950cc26a213c08715ee7a7d9fa7265826277bb
am 1c950cc2: (-s ours) am 2be61f66: am dfca664a: am 831da613: Merge "Set camera controls visibility based on whether the camera preview is centered." into gb-ub-photos-carlsbad

* commit '1c950cc26a213c08715ee7a7d9fa7265826277bb':