tree ccc2e69bb92259cb595ebc0359809599dcc39cbe
parent 939e80d0d073e69e912015dde880c07590d25a37
parent 40d489376906d2fcae13ee45825f7391727bcb5e
author Wu-cheng Li <wuchengli@google.com> 1287503053 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287503053 -0700

am f73d48d7: Merge "Fix some camera orientation javadoc errors." into gingerbread

Merge commit 'f73d48d754b11f6ed0fba017f5bc8f27acdfbe4f' into gingerbread-plus-aosp

* commit 'f73d48d754b11f6ed0fba017f5bc8f27acdfbe4f':
  Fix some camera orientation javadoc errors.