Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47c9507c authored by Dan Bornstein's avatar Dan Bornstein Committed by Android (Google) Code Review
Browse files

Merge "Fix another set of out-of-date headers."

parents e0383c2e 4bb407d4

opengl/tests/gl2_java/AndroidManifest.xml

+13 −17
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?>

<!--

<!-- Copyright (C) 2009 The Android Open Source Project

/*



**

     Licensed under the Apache License, Version 2.0 (the "License");

** Copyright 2009, The Android Open Source Project

     you may not use this file except in compliance with the License.

**

     You may obtain a copy of the License at

** Licensed under the Apache License, Version 2.0 (the "License"); 



** you may not use this file except in compliance with the License. 

          http://www.apache.org/licenses/LICENSE-2.0

** You may obtain a copy of the License at 



**

     Unless required by applicable law or agreed to in writing, software

**     http://www.apache.org/licenses/LICENSE-2.0 

     distributed under the License is distributed on an "AS IS" BASIS,

**

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** Unless required by applicable law or agreed to in writing, software 

     See the License for the specific language governing permissions and

** distributed under the License is distributed on an "AS IS" BASIS, 

     limitations under the License.

** 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.

*/

-->

-->





<manifest xmlns:android="http://schemas.android.com/apk/res/android"

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

opengl/tests/gl2_java/res/values/strings.xml

+13 −17
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?>

<!--

<!-- Copyright (C) 2006 The Android Open Source Project

/*



**

     Licensed under the Apache License, Version 2.0 (the "License");

** Copyright 2006, The Android Open Source Project

     you may not use this file except in compliance with the License.

**

     You may obtain a copy of the License at

** Licensed under the Apache License, Version 2.0 (the "License"); 



** you may not use this file except in compliance with the License. 

          http://www.apache.org/licenses/LICENSE-2.0

** You may obtain a copy of the License at 



**

     Unless required by applicable law or agreed to in writing, software

**     http://www.apache.org/licenses/LICENSE-2.0 

     distributed under the License is distributed on an "AS IS" BASIS,

**

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** Unless required by applicable law or agreed to in writing, software 

     See the License for the specific language governing permissions and

** distributed under the License is distributed on an "AS IS" BASIS, 

     limitations under the License.

** 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.

*/

-->

-->





<!-- This file contains resource definitions for displayed strings, allowing

<!-- This file contains resource definitions for displayed strings, allowing

opengl/tests/gl2_jni/AndroidManifest.xml

+13 −17
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?>

<!--

<!-- Copyright (C) 2009 The Android Open Source Project

/*



**

     Licensed under the Apache License, Version 2.0 (the "License");

** Copyright 2009, The Android Open Source Project

     you may not use this file except in compliance with the License.

**

     You may obtain a copy of the License at

** Licensed under the Apache License, Version 2.0 (the "License"); 



** you may not use this file except in compliance with the License. 

          http://www.apache.org/licenses/LICENSE-2.0

** You may obtain a copy of the License at 



**

     Unless required by applicable law or agreed to in writing, software

**     http://www.apache.org/licenses/LICENSE-2.0 

     distributed under the License is distributed on an "AS IS" BASIS,

**

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** Unless required by applicable law or agreed to in writing, software 

     See the License for the specific language governing permissions and

** distributed under the License is distributed on an "AS IS" BASIS, 

     limitations under the License.

** 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.

*/

-->

-->





<manifest xmlns:android="http://schemas.android.com/apk/res/android"

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

opengl/tests/gl2_jni/res/values/strings.xml

+13 −17
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?>

<!--

<!-- Copyright (C) 2006 The Android Open Source Project

/*



**

     Licensed under the Apache License, Version 2.0 (the "License");

** Copyright 2006, The Android Open Source Project

     you may not use this file except in compliance with the License.

**

     You may obtain a copy of the License at

** Licensed under the Apache License, Version 2.0 (the "License"); 



** you may not use this file except in compliance with the License. 

          http://www.apache.org/licenses/LICENSE-2.0

** You may obtain a copy of the License at 



**

     Unless required by applicable law or agreed to in writing, software

**     http://www.apache.org/licenses/LICENSE-2.0 

     distributed under the License is distributed on an "AS IS" BASIS,

**

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** Unless required by applicable law or agreed to in writing, software 

     See the License for the specific language governing permissions and

** distributed under the License is distributed on an "AS IS" BASIS, 

     limitations under the License.

** 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.

*/

-->

-->





<!-- This file contains resource definitions for displayed strings, allowing

<!-- This file contains resource definitions for displayed strings, allowing

opengl/tests/gl_jni/AndroidManifest.xml

+13 −17
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?>

<!--

<!-- Copyright (C) 2009 The Android Open Source Project

/*



**

     Licensed under the Apache License, Version 2.0 (the "License");

** Copyright 2009, The Android Open Source Project

     you may not use this file except in compliance with the License.

**

     You may obtain a copy of the License at

** Licensed under the Apache License, Version 2.0 (the "License"); 



** you may not use this file except in compliance with the License. 

          http://www.apache.org/licenses/LICENSE-2.0

** You may obtain a copy of the License at 



**

     Unless required by applicable law or agreed to in writing, software

**     http://www.apache.org/licenses/LICENSE-2.0 

     distributed under the License is distributed on an "AS IS" BASIS,

**

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** Unless required by applicable law or agreed to in writing, software 

     See the License for the specific language governing permissions and

** distributed under the License is distributed on an "AS IS" BASIS, 

     limitations under the License.

** 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.

*/

-->

-->





<manifest xmlns:android="http://schemas.android.com/apk/res/android"

<manifest xmlns:android="http://schemas.android.com/apk/res/android"