OSDN Git Service

am ff42ae0e: am b65537df: Merge change Ida3e9964 into eclair-mr2
authorWu-cheng Li <wuchengli@google.com>
Fri, 11 Dec 2009 09:40:33 +0000 (01:40 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Dec 2009 09:40:33 +0000 (01:40 -0800)
Merge commit 'ff42ae0e23bb04e316d46571d797af43cf8f4d7d'

* commit 'ff42ae0e23bb04e316d46571d797af43cf8f4d7d':
  Add flash light setting in video camera.


Trivial merge