tree 3102fce84da50c28a159000716e4426021a3a25e
parent c56c92013c0acfa4517ed5d36d8aa78bc21452ae
parent 5d87227bad8126d701145cd07c3ac2a365e8480e
author Wei Huang <weih@google.com> 1316792026 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316792026 -0700

am 5d87227b: Merge "Clear callbacks in camera stopPreview." into ics-factoryrom

* commit '5d87227bad8126d701145cd07c3ac2a365e8480e':
  Clear callbacks in camera stopPreview.