diff options
author | Doris Liu <tianliu@google.com> | 2013-10-13 15:31:12 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-13 15:31:12 -0700 |
commit | 331201407e613e5a243b8cf6e8f3d5bdb647e6c5 (patch) | |
tree | d9e1b953ac3590517bff012fb9a2782df4bec8e8 /res | |
parent | 22b0d455358f7f816b2f328a062e72df8b6d3c63 (diff) | |
parent | c937ab7f9bac633aa425da62348f9eb07c248450 (diff) | |
download | android_packages_apps_Snap-331201407e613e5a243b8cf6e8f3d5bdb647e6c5.tar.gz android_packages_apps_Snap-331201407e613e5a243b8cf6e8f3d5bdb647e6c5.tar.bz2 android_packages_apps_Snap-331201407e613e5a243b8cf6e8f3d5bdb647e6c5.zip |
am c937ab7f: Merge "Fix for mis-placed camera controls" into gb-ub-photos-carlsbad
* commit 'c937ab7f9bac633aa425da62348f9eb07c248450':
Fix for mis-placed camera controls
Diffstat (limited to 'res')
-rw-r--r-- | res/values-sw600dp/booleans.xml | 18 | ||||
-rw-r--r-- | res/values/bool.xml | 1 |
2 files changed, 0 insertions, 19 deletions
diff --git a/res/values-sw600dp/booleans.xml b/res/values-sw600dp/booleans.xml deleted file mode 100644 index c7522cfa9..000000000 --- a/res/values-sw600dp/booleans.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 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> - <bool name="is_tablet">true</bool> -</resources>
\ No newline at end of file diff --git a/res/values/bool.xml b/res/values/bool.xml index 067e3d9a9..464842ab4 100644 --- a/res/values/bool.xml +++ b/res/values/bool.xml @@ -15,5 +15,4 @@ --> <resources> <bool name="show_action_bar_title">false</bool> - <bool name="is_tablet">false</bool> </resources>
\ No newline at end of file |