am e4816864: am 59eaa907: Merge "Fix a race condition in Camera API for handling focus" into jb-dev
am e4816864: am 59eaa907: Merge "Fix a race condition in Camera API for handling focus" into jb-dev

* commit 'e481686464197f808d0e4f13821bb29831810645':
  Fix a race condition in Camera API for handling focus

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base