diff options
| author | Trevor Johns <trevorjohns@google.com> | 2014-11-12 11:39:30 -0800 |
|---|---|---|
| committer | Trevor Johns <trevorjohns@google.com> | 2014-11-12 11:39:30 -0800 |
| commit | 527a4f30a69aaa54fc9654539f0b6d839e37af3c (patch) | |
| tree | 38f816a286e672e8f00caed6a0344c3c18632a78 /samples/browseable/CustomTransition/res/values | |
| parent | fcd28181a15ebe95724fe096a8b5198c964b0d7f (diff) | |
| download | android_development-527a4f30a69aaa54fc9654539f0b6d839e37af3c.tar.gz android_development-527a4f30a69aaa54fc9654539f0b6d839e37af3c.tar.bz2 android_development-527a4f30a69aaa54fc9654539f0b6d839e37af3c.zip | |
Update browseable samples for lmp-docs
Synced to commit df5e5013422b81b4fd05c0ac9fd964b13624847a. Includes
new samples for Android Auto.
Change-Id: I3fec46e2a6b3f196682a92f1afd91eb682dc2dc1
Diffstat (limited to 'samples/browseable/CustomTransition/res/values')
| -rw-r--r-- | samples/browseable/CustomTransition/res/values/base-strings.xml | 3 | ||||
| -rwxr-xr-x | samples/browseable/CustomTransition/res/values/strings.xml | 19 |
2 files changed, 0 insertions, 22 deletions
diff --git a/samples/browseable/CustomTransition/res/values/base-strings.xml b/samples/browseable/CustomTransition/res/values/base-strings.xml index 68c9c4146..ee1dad40a 100644 --- a/samples/browseable/CustomTransition/res/values/base-strings.xml +++ b/samples/browseable/CustomTransition/res/values/base-strings.xml @@ -14,9 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - <resources> <string name="app_name">CustomTransition</string> <string name="intro_message"> diff --git a/samples/browseable/CustomTransition/res/values/strings.xml b/samples/browseable/CustomTransition/res/values/strings.xml deleted file mode 100755 index 7b9d9ec4f..000000000 --- a/samples/browseable/CustomTransition/res/values/strings.xml +++ /dev/null @@ -1,19 +0,0 @@ -<!-- - Copyright 2013 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. ---> -<resources> - <string name="sample_show_log">Show Log</string> - <string name="sample_hide_log">Hide Log</string> -</resources> |