tree f8931a8a046afa4bf931aa8b1410c8eb9ffe4ff6
parent 0a9638f20cdc8f68a69280e6734b3e6c681ca7d8
parent 37a6cee614e7654b44b00ced591d4ce4d283fb17
author Wu-cheng Li <wuchengli@google.com> 1284588059 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284588059 -0700

am 37a6cee6: Update camera test due to API change.

Merge commit '37a6cee614e7654b44b00ced591d4ce4d283fb17' into gingerbread-plus-aosp

* commit '37a6cee614e7654b44b00ced591d4ce4d283fb17':
  Update camera test due to API change.