diff --git a/build/Android.mk b/build/Android.mk
index e91ff989d..6b854eedf 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -103,8 +103,9 @@ endef
 ANDROID_SUPPORT_LIBRARIES := \
     android-support-annotations \
     android-support-v4 \
-    android-support-v7-gridlayout \
     android-support-v7-appcompat \
+    android-support-v7-cardview \
+    android-support-v7-gridlayout \
     android-support-v7-mediarouter \
     android-support-v7-palette \
     android-support-v7-recyclerview \
diff --git a/build/sdk.atree b/build/sdk.atree
index 175cc6333..0b312c464 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -406,6 +406,12 @@ frameworks/support/v7/palette/AndroidManifest.xml
 frameworks/support/v7/palette/project.properties                                                  extras/android/support/v7/palette/project.properties
 ${OUT_DIR}/target/common/obj/PACKAGING/android-support-v7-palette_intermediates/android-support-v7-palette.jar    extras/android/support/v7/palette/libs/android-support-v7-palette.jar
 
+frameworks/support/v7/cardview/AndroidManifest.xml                                              extras/android/support/v7/cardview/AndroidManifest.xml
+frameworks/support/v7/cardview/res                                                              extras/android/support/v7/cardview/res
+frameworks/support/v7/cardview/src/.readme                                                      extras/android/support/v7/cardview/src/.readme
+${OUT_DIR}/target/common/obj/PACKAGING/android-support-v7-cardview_intermediates/android-support-v7-cardview.jar    extras/android/support/v7/mediarouter/libs/android-support-v7-cardview.jar
+
+
 # TODO: add .project, .classpath, etc.
 frameworks/support/v7/recyclerview/README.txt                                                     extras/android/support/v7/recyclerview/README.txt
 frameworks/support/v7/recyclerview/AndroidManifest.xml                                            extras/android/support/v7/recyclerview/AndroidManifest.xml