Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/PackageInstaller into cm-13.0staging/cm-13.0+r22

Android 6.0.1 release 22

1 files changed, 21 insertions, 0 deletions

diff --git a/res/drawable-watch/deny_button.xml b/res/drawable-watch/deny_button.xml
new file mode 100644
index 00000000..1e7582bc
--- /dev/null
+++ b/res/drawable-watch/deny_button.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:drawable="@drawable/action_negative_bg" />
+    <item>
+        <bitmap android:src="@drawable/ic_cc_deny" android:gravity="center" />
+    </item>
+</layer-list>