tree a31ed20999b2c883e48993cdf5886a679211bb6b
parent dc059804666c35abf51d09481f2fe5516339fcc6
parent d72c1172f669d0a50a5164672c354ec7fb4ac9aa
author Romain Guy <romainguy@google.com> 1282782720 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282782720 -0700

am d72c1172: am 0c490839: Merge "reserve android.opengl.GLWallpaperService name for future use" into gingerbread

Merge commit 'd72c1172f669d0a50a5164672c354ec7fb4ac9aa'

* commit 'd72c1172f669d0a50a5164672c354ec7fb4ac9aa':
  reserve android.opengl.GLWallpaperService name for future use