tree 46215dd95737d9792c357563e5bb151612a06b93
parent 2e7427f39ec15dcb43cc1247372b53980be11d38
parent f45b674d48ff91972e4b8ffbbe3c4bd16d231bdc
author Romain Guy <romainguy@google.com> 1282782380 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1282782380 -0700

Merge "reserve android.opengl.GLWallpaperService name for future use" into gingerbread