diff options
author | Romain Guy <romainguy@google.com> | 2010-08-25 17:28:50 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-25 17:28:50 -0700 |
commit | d72c1172f669d0a50a5164672c354ec7fb4ac9aa (patch) | |
tree | d9058fb9604f99e80f47362081abe9dcf8059695 /opengl | |
parent | eb0e0f465155bc9ec2c79741890fb65bd403e33a (diff) | |
parent | 0c490839b2d25fec99f1ae86dcebc5f21a2df8bb (diff) | |
download | frameworks_base-d72c1172f669d0a50a5164672c354ec7fb4ac9aa.zip frameworks_base-d72c1172f669d0a50a5164672c354ec7fb4ac9aa.tar.gz frameworks_base-d72c1172f669d0a50a5164672c354ec7fb4ac9aa.tar.bz2 |
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
Diffstat (limited to 'opengl')
-rw-r--r-- | opengl/java/android/opengl/GLWallpaperService.java | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/opengl/java/android/opengl/GLWallpaperService.java b/opengl/java/android/opengl/GLWallpaperService.java new file mode 100644 index 0000000..c954fed --- /dev/null +++ b/opengl/java/android/opengl/GLWallpaperService.java @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2010 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.opengl; + +/** + * reserve this namespace for future use + * (making sure external developers don't use it) + * @hide + */ +class GLWallpaperService { +} |