tree 14ca34daef1bc05d25480439a85f0f3d571a4411
parent b6f23a6cbcdf627081b5486e002944af617ecddb
parent 386d8871dc24bfcc91a1d9f7b228a13745bed60a
author Mike Cleron <mcleron@google.com> 1257812175 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257812175 -0800

am 386d8871: Merge change I0bda9c39 into eclair

Merge commit '386d8871dc24bfcc91a1d9f7b228a13745bed60a' into eclair-mr2

* commit '386d8871dc24bfcc91a1d9f7b228a13745bed60a':
  One camera is probably sufficient