tree dddee026d69e0c4f99418825b3d8894cf57febef
parent 1d58b498de5eb3b53ca0c7ffd14b1c209833d297
parent cbbc035b640790650d0e377a2d6291cc523a2a35
author Chih-Chung Chang <chihchung@google.com> 1277697276 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277697276 -0700

am cbbc035b: am de1057c4: Unhide new API for supporting multiple cameras.

Merge commit 'cbbc035b640790650d0e377a2d6291cc523a2a35'

* commit 'cbbc035b640790650d0e377a2d6291cc523a2a35':
  Unhide new API for supporting multiple cameras.