tree 5f34282b3eb2cf6404778e64d3cae677542d8de7
parent 29bbc4a6bc001c3255931dded77a5112c5496874
parent 646723c06120cc9344463f6b3f001178e606838f
author Emilian Peev <epeev@mm-sol.com> 1352161175 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352161175 -0800

am 646723c0: am b96dffd4: CameraHal: Sync AF cancel with incoming OMX events

* commit '646723c06120cc9344463f6b3f001178e606838f':
  CameraHal: Sync AF cancel with incoming OMX events