diff options
| author | Romain Guy <romainguy@google.com> | 2010-08-25 17:32:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-25 17:32:00 -0700 |
| commit | 06b9a14c45cecfdc2569f1787e9b4c6f3633b156 (patch) | |
| tree | a31ed20999b2c883e48993cdf5886a679211bb6b /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | dc059804666c35abf51d09481f2fe5516339fcc6 (diff) | |
| parent | d72c1172f669d0a50a5164672c354ec7fb4ac9aa (diff) | |
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
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions