author | Iliyan Malchev <malchev@google.com> | |
Wed, 14 Oct 2009 14:56:22 +0000 (07:56 -0700) | ||
committer | Android Git Automerger <android-git-automerger@android.com> | |
Wed, 14 Oct 2009 14:56:22 +0000 (07:56 -0700) |
Merge commit '0e24d2c944e2eacd2f9ccefbfbda904fab7cf273'
* commit '0e24d2c944e2eacd2f9ccefbfbda904fab7cf273':
update msm_camera.h
* commit '0e24d2c944e2eacd2f9ccefbfbda904fab7cf273':
update msm_camera.h
Trivial merge