commit 4bffbdb928a5cad83387f18203b36115b47401dc
author Fan Zhang <zhfan@google.com> Mon Apr 11 16:25:04 2016 +0000
committer Fan Zhang <zhfan@google.com> Mon Apr 11 09:56:46 2016 -0700
tree 802c1938c2e714879474807c6e9656173b82809d
parent 3645373b6ff527402a2fe61dfd5573a5845bbc42

Revert "Add suggestion carousel view and dependencies to settings"

This reverts commit 0050ac0bb759d15539c7551ea6149e521ad0cc08.

Change-Id: Ic61137bae0fa1a6de5ba4970e8a3a3b4fe0469a3

Android.mk

diff --git a/Android.mk b/Android.mk
index f45713d..ea068af 100644
--- a/Android.mk
+++ b/Android.mk
@@ -9,7 +9,6 @@
     android-support-v7-preference \
     android-support-v7-appcompat \
     android-support-v14-preference \
-    android-support-v7-cardview \
     jsr305
 
 LOCAL_MODULE_TAGS := optional
@@ -22,8 +21,7 @@
     frameworks/support/v7/preference/res \
     frameworks/support/v14/preference/res \
     frameworks/support/v7/appcompat/res \
-    frameworks/support/v7/recyclerview/res \
-    frameworks/support/v7/cardview/res
+    frameworks/support/v7/recyclerview/res
 
 LOCAL_PACKAGE_NAME := Settings
 LOCAL_CERTIFICATE := platform
@@ -32,7 +30,7 @@
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 LOCAL_AAPT_FLAGS := --auto-add-overlay \
-    --extra-packages android.support.v7.preference:android.support.v14.preference:android.support.v17.preference:android.support.v7.appcompat:android.support.v7.recyclerview:android.support.v7.cardview
+    --extra-packages android.support.v7.preference:android.support.v14.preference:android.support.v17.preference:android.support.v7.appcompat:android.support.v7.recyclerview
 
 ifneq ($(INCREMENTAL_BUILDS),)
     LOCAL_PROGUARD_ENABLED := disabled