OSDN Git Service

am 0a91a547: am 0ee41ccc: Merge change I1558a070 into eclair-mr2
authorOwen Lin <owenlin@google.com>
Tue, 8 Dec 2009 02:30:14 +0000 (18:30 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Dec 2009 02:30:14 +0000 (18:30 -0800)
commitbe6ed6cd0f09087cd6a3d5c761337531c927a91c
tree9437de98b47537ea13f0b680e15dfc2cfe7d8ff4
parent97c09f936e9bd032835a361931fbfbd603d37d4b
parent545259866d08b430b279ff8c85eeceaf93a9172c
am 0a91a547: am 0ee41ccc: Merge change I1558a070 into eclair-mr2

Merge commit '0a91a547ee32d559b7b737f69430d4d0732dfca9'

* commit '0a91a547ee32d559b7b737f69430d4d0732dfca9':
  Fix the camera preview demo.