summaryrefslogtreecommitdiffstats
path: root/navigationbar/res/layout/setup_wizard_navbar_layout.xml
diff options
context:
space:
mode:
authorMaurice Lam <yukl@google.com>2014-06-23 20:33:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-06-20 21:00:34 +0000
commit4f35a014222af63c5f931f1cd010d594ee09ed5f (patch)
tree2a4adfb64ca131b506b21f25edb20a291bfedfbc /navigationbar/res/layout/setup_wizard_navbar_layout.xml
parentcc5296ce61763c9f550c6177d0b0ff0e019b81c0 (diff)
parent40dd08f091020a436af0d253d2cb54f560493920 (diff)
downloadandroid_frameworks_opt_setupwizard-4f35a014222af63c5f931f1cd010d594ee09ed5f.tar.gz
android_frameworks_opt_setupwizard-4f35a014222af63c5f931f1cd010d594ee09ed5f.tar.bz2
android_frameworks_opt_setupwizard-4f35a014222af63c5f931f1cd010d594ee09ed5f.zip
Merge "Make copyright headers consistent"
Diffstat (limited to 'navigationbar/res/layout/setup_wizard_navbar_layout.xml')
-rw-r--r--navigationbar/res/layout/setup_wizard_navbar_layout.xml29
1 files changed, 13 insertions, 16 deletions
diff --git a/navigationbar/res/layout/setup_wizard_navbar_layout.xml b/navigationbar/res/layout/setup_wizard_navbar_layout.xml
index 627e7d4..6bdb02d 100644
--- a/navigationbar/res/layout/setup_wizard_navbar_layout.xml
+++ b/navigationbar/res/layout/setup_wizard_navbar_layout.xml
@@ -1,22 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-/**
- * Copyright (c) 2010 Google Inc.
- *
- * 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.
- */
--->
+ Copyright (C) 2014 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.
+-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/setup_wizard_navbar_style" >