commit 974316895d8737f5bae5ca015a99fe50581c9ddb
author Alan Viverette <alanv@google.com> Wed Jun 11 13:07:57 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 11 13:07:57 2014 +0000
tree 419d47feeaaeda14d5211907ff7f18b6717c3613
parent 40b771b5600e3d8741b35120a5e058eb0f4e19c5
parent 5dc1c303637aa20434cc633133c52755a979cc65

am 5dc1c303: Merge "Ripple tint is now color" into lmp-preview-dev

* commit '5dc1c303637aa20434cc633133c52755a979cc65':
  Ripple tint is now color

res/drawable/pad_btn_background.xml

diff --git a/res/drawable/pad_btn_background.xml b/res/drawable/pad_btn_background.xml
index 1366dfc..2f9f2db 100644
--- a/res/drawable/pad_btn_background.xml
+++ b/res/drawable/pad_btn_background.xml
@@ -15,7 +15,5 @@
   limitations under the License.
   -->
 
-<ripple
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:tint="@color/pad_button_tint_color"
-    android:pinned="true" />
\ No newline at end of file
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/pad_button_tint_color" />
\ No newline at end of file