summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Bornstein <danfuzz@android.com>2010-12-07 16:27:31 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-12-07 16:27:31 -0800
commit8028a951c3aa74990907efb9376d1093d84084af (patch)
tree8df58e58347f0e5899b61bac5a2d8374181ee105
parent331edf84e2815e309c558e7cedbc414fb23162ec (diff)
parentc087a87e01b9544c28a7a9e2d14491917baee73c (diff)
downloadframeworks_base-8028a951c3aa74990907efb9376d1093d84084af.zip
frameworks_base-8028a951c3aa74990907efb9376d1093d84084af.tar.gz
frameworks_base-8028a951c3aa74990907efb9376d1093d84084af.tar.bz2
Merge "Fix newlines in this file."
-rw-r--r--opengl/tools/glgen/stubs/gles11/glGetString.java42
1 files changed, 21 insertions, 21 deletions
diff --git a/opengl/tools/glgen/stubs/gles11/glGetString.java b/opengl/tools/glgen/stubs/gles11/glGetString.java
index d44a6dd..b02a0d1 100644
--- a/opengl/tools/glgen/stubs/gles11/glGetString.java
+++ b/opengl/tools/glgen/stubs/gles11/glGetString.java
@@ -1,21 +1,21 @@
-/*
- * Copyright (C) 2009 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.
- */
-
- // C function const GLubyte * glGetString ( GLenum name )
-
- public static native String glGetString(
- int name
- );
+/*
+ * Copyright (C) 2009 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.
+ */
+
+ // C function const GLubyte * glGetString ( GLenum name )
+
+ public static native String glGetString(
+ int name
+ );