tree b13ad68a21510fc82529b02fd09071c16369c428
parent 9ac3743dbdf729bf543d5e72628460dd51802f5e
parent 71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5
author Romain Guy <romainguy@google.com> 1276027230 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1276027230 -0700

am 71d73a0d: Merge "Add a method to hide/show a SurfaceView\'s surface." into froyo

Merge commit '71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5' into kraken

* commit '71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5':
  Add a method to hide/show a SurfaceView's surface.