tree 96d4e1e9de3dffa021358e0ec54406f0b12cab65
parent d77b0dfdf364ed2fabd9d7a2b26d54e34fce0855
parent 962e482606e3f8f8c0b8e540888eaef56a1c8603
author Jean-Baptiste Queru <jbq@google.com> 1284158854 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284158854 -0700

am 962e4826: Merge "Allow two SurfaceViews inbetween the app and the wallpaper."

Merge commit '962e482606e3f8f8c0b8e540888eaef56a1c8603' into gingerbread-plus-aosp

* commit '962e482606e3f8f8c0b8e540888eaef56a1c8603':
  Allow two SurfaceViews inbetween the app and the wallpaper.