tree 6d87052a562598adfbe4599a9df01182035bda53
parent d704c4d7112919f26243a2a24858332bf1fb2f5c
parent 0e24d2c944e2eacd2f9ccefbfbda904fab7cf273
author Iliyan Malchev <malchev@google.com> 1255492837 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255492837 -0700

am 0e24d2c9: update msm_camera.h

Merge commit '0e24d2c944e2eacd2f9ccefbfbda904fab7cf273' into eclair-plus-aosp

* commit '0e24d2c944e2eacd2f9ccefbfbda904fab7cf273':
  update msm_camera.h