2ad1ebcaab
Merge commit 'd45cb72ac0d7d57829ffc9223decb89a5fc42ce2' into gingerbread-plus-aosp * commit 'd45cb72ac0d7d57829ffc9223decb89a5fc42ce2': Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.