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)
commit05a2286e3142b44c8baa929c079300255bdf6bc2
treeb4067e3c07a5574599e341ea96be7759fb8e7351
parent78e09cc5e70ccf8beb4b29df45ac438a38b1212f
parentff42ae0e23bb04e316d46571d797af43cf8f4d7d
am ff42ae0e: am b65537df: Merge change Ida3e9964 into eclair-mr2

Merge commit 'ff42ae0e23bb04e316d46571d797af43cf8f4d7d'

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