diff options
| author | Svetoslav <svetoslavganov@google.com> | 2015-11-20 22:06:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-20 22:06:35 +0000 |
| commit | 3f849f410808a0bca039d73fd763825c73d15419 (patch) | |
| tree | a9af0794f210bd49a37148dbb2740469ca327ebe /res/drawable/header_background.xml | |
| parent | 786cf97b83a4e502b8683198cdea8872c8507b93 (diff) | |
| parent | ef861375eebd9ac6cce7c0bb163380ab1c951063 (diff) | |
| download | android_packages_apps_PackageInstaller-3f849f410808a0bca039d73fd763825c73d15419.tar.gz android_packages_apps_PackageInstaller-3f849f410808a0bca039d73fd763825c73d15419.tar.bz2 android_packages_apps_PackageInstaller-3f849f410808a0bca039d73fd763825c73d15419.zip | |
resolve merge conflicts of c10abb25f3 to cw-e-dev.
am: ef861375ee
* commit 'ef861375eebd9ac6cce7c0bb163380ab1c951063':
resolve merge conflicts of c10abb25f3 to cw-e-dev.
Diffstat (limited to 'res/drawable/header_background.xml')
| -rw-r--r-- | res/drawable/header_background.xml | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/res/drawable/header_background.xml b/res/drawable/header_background.xml deleted file mode 100644 index 77db9e03..00000000 --- a/res/drawable/header_background.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2015 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. ---> - -<ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:color="?android:attr/colorControlHighlight"> - <item android:drawable="@color/header_background_color" /> -</ripple> - |