am a46c372a: Merge "Make camera FOCUS_MODE_CONTINUOUS_PICTURE public."

* commit 'a46c372a75972dbfe73b1813d69fa047c3454b83':
  Make camera FOCUS_MODE_CONTINUOUS_PICTURE public.