tree 3ff108c0340688afde41e9c2ed5fee904a3de25d
parent 2507f7801eb3d12ee31661c919f0d507ef49adfb
parent 514a6cfb7f7085b266f457155ff63373d2dff8ee
author Wu-cheng Li <wuchengli@google.com> 1318487774 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318487774 -0700

am 514a6cfb: Merge "Improve camera javadoc and fix some errors." into ics-mr0

* commit '514a6cfb7f7085b266f457155ff63373d2dff8ee':
  Improve camera javadoc and fix some errors.