tree 5dcf22a0d620dfa8cd06858715b8937c580f6487
parent 92b328b67a694afc19071c807b80f100663fd5e4
parent 2ad1ebcaabb632c8fe714f0c3fd88bdfa14697bd
author Wu-cheng Li <wuchengli@google.com> 1285091078 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285091078 -0700

am 2ad1ebca: am d45cb72a: Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.

Merge commit '2ad1ebcaabb632c8fe714f0c3fd88bdfa14697bd'

* commit '2ad1ebcaabb632c8fe714f0c3fd88bdfa14697bd':
  Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.