am 0c490839: Merge "reserve android.opengl.GLWallpaperService name for future use" into gingerbread
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

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base