commit e1ee607b28cd81e9759c73035b7375fcc3c945f5
author Colin Cross <ccross@android.com> Wed Feb 15 20:33:58 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 15 20:33:58 2017 +0000
tree f60a04c23c98b57ea6843225bc102a6571fd87f8
parent c1bd6a19590fbab8fb1750865ef496275712e144
parent 9a92a189f67470a6ba636cf1e9f5d093608d9a96

Merge "Add missing transitive dependencies"
am: 9a92a189f6

Change-Id: I36f03053988adbd3fec2e977af98e1740b80a782

Android.mk

diff --git a/Android.mk b/Android.mk
index 02e075f..0978bec 100644
--- a/Android.mk
+++ b/Android.mk
@@ -32,7 +32,8 @@
     $(support_library_root_dir)/v7/cardview/res \
     $(support_library_root_dir)/v7/recyclerview/res \
     $(support_library_root_dir)/v7/appcompat/res \
-    $(support_library_root_dir)/design/res
+    $(support_library_root_dir)/design/res \
+    $(support_library_root_dir)/transition/res
 
 LOCAL_AAPT_FLAGS := \
     --auto-add-overlay \
@@ -40,6 +41,7 @@
     --extra-packages android.support.v7.cardview \
     --extra-packages android.support.v7.recyclerview \
     --extra-packages android.support.design \
+    --extra-packages android.support.transition \
     --extra-packages com.android.incallui \
     --extra-packages com.android.contacts.common \
     --extra-packages com.android.phone.common
@@ -52,6 +54,7 @@
     android-support-v7-cardview \
     android-support-v7-recyclerview \
     android-support-design \
+    android-support-transition \
     com.android.vcard \
     guava \
     libphonenumber