summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMangesh Ghiware <mghiware@google.com>2013-10-04 15:22:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-04 15:22:19 -0700
commit2c95964ecf60c4865d3651d366ef2763ef22270b (patch)
tree8d4e372b0d638ba45d683275e07b6e59054b1061 /res
parent3780397df9e6e17dd65e121d952e44cd0fad807a (diff)
parent91215c00fc8828373b6680fa88609ace8c985b57 (diff)
downloadandroid_packages_apps_Gallery2-2c95964ecf60c4865d3651d366ef2763ef22270b.tar.gz
android_packages_apps_Gallery2-2c95964ecf60c4865d3651d366ef2763ef22270b.tar.bz2
android_packages_apps_Gallery2-2c95964ecf60c4865d3651d366ef2763ef22270b.zip
am 91215c00: am 47f602c3: Revert "Disable GET_CONTENT intent-filter for KLP+"
* commit '91215c00fc8828373b6680fa88609ace8c985b57': Revert "Disable GET_CONTENT intent-filter for KLP+"
Diffstat (limited to 'res')
-rw-r--r--res/values-v19/bool.xml18
-rw-r--r--res/values/bool.xml3
2 files changed, 1 insertions, 20 deletions
diff --git a/res/values-v19/bool.xml b/res/values-v19/bool.xml
deleted file mode 100644
index 143b89487..000000000
--- a/res/values-v19/bool.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="atMostJellyBeanMR2">false</bool>
-</resources>
diff --git a/res/values/bool.xml b/res/values/bool.xml
index 4e54d7c23..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="atMostJellyBeanMR2">true</bool>
-</resources>
+</resources> \ No newline at end of file