tree d9058fb9604f99e80f47362081abe9dcf8059695
parent eb0e0f465155bc9ec2c79741890fb65bd403e33a
parent 0c490839b2d25fec99f1ae86dcebc5f21a2df8bb
author Romain Guy <romainguy@google.com> 1282782530 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282782530 -0700

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

Merge commit '0c490839b2d25fec99f1ae86dcebc5f21a2df8bb' into gingerbread-plus-aosp

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