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