tree b8e20428ca5b4e87a3242af0517a8d2d00652448
parent 120c48aab80f4344c3bf2bd890743783d0802223
parent 0a2735928030229b3340074eb11c2423342fda93
author Eino-Ville Talvala <etalvala@google.com> 1318441211 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318441211 -0700

am 0a273592: Merge "Add video stabilization control to Camera parameters." into ics-mr0

* commit '0a2735928030229b3340074eb11c2423342fda93':
  Add video stabilization control to Camera parameters.