Merge commit '46ad796186bdca8bac75607340aa0fac0c34a9d8' into eclair-plus-aosp * commit '46ad796186bdca8bac75607340aa0fac0c34a9d8': Unhide cancelAutoFocus API in Camera.
Merge commit '46ad796186bdca8bac75607340aa0fac0c34a9d8' into eclair-plus-aosp * commit '46ad796186bdca8bac75607340aa0fac0c34a9d8': Unhide cancelAutoFocus API in Camera.