tree 21edb0042544685f2692c8746590ab38af8cecce
parent e2a090fa1d269583d3e0def028b8b271d42f50ff
parent 76c4cb50e555d6bcd9fcd11822dc893c0324db84
author James Dong <jdong@google.com> 1258397040 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258397040 -0800

am 76c4cb50: Fix an incorrect time profiling bug in camera MIO

Merge commit '76c4cb50e555d6bcd9fcd11822dc893c0324db84' into eclair-mr2

* commit '76c4cb50e555d6bcd9fcd11822dc893c0324db84':
  Fix an incorrect time profiling bug in camera MIO