tree 908a772fc6badc5e38b1808a802627f01594201f
parent 0e7e760651e61dd7a52c58daf0880cb8cfd4bb7c
parent 56b5c2861d6df04f58a080d26eea9b52953d1e31
author Mathias Agopian <mathias@google.com> 1286410050 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286410050 -0700

am 722665c5: am ef115308: fix build. SurfaceView.setFrame needed to be hidden

Merge commit '722665c5f76e81bed646490977ea30f38aaa00da'

* commit '722665c5f76e81bed646490977ea30f38aaa00da':
  fix build. SurfaceView.setFrame needed to be hidden