am 0619f2e7: am 0e24d2c9: update msm_camera.h

Merge commit '0619f2e744b239942841f7e0993d594d074a83f8'

* commit '0619f2e744b239942841f7e0993d594d074a83f8':