tree be10d54b4d462ceec3674d9ded2ffba2efdf100d
parent 8485fedfebd37f0569226c360e1147402f47f74c
parent 03821dc6ea9f96e2b420ab327b727fdcefd880d3
author Jean-Baptiste Queru <jbq@google.com> 1284160997 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284160997 -0700

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

Merge commit '03821dc6ea9f96e2b420ab327b727fdcefd880d3'

* commit '03821dc6ea9f96e2b420ab327b727fdcefd880d3':
  Allow two SurfaceViews inbetween the app and the wallpaper.