commit 957fa659c23ed74b9d3f18b25fdf162339ee6742
author Tim Kilbourn <tkilbourn@google.com> Wed Mar 12 17:27:10 2014 -0700
committer Tim Kilbourn <tkilbourn@google.com> Wed Mar 12 17:27:10 2014 -0700
tree 99514e9e98bdfaca4e9992c7109aa2b495bb1f0d
parent d43bf2c3714332832cf4ec1c99c2a9fa24784ab2
parent 9eecf3fc97d3983cb488396f1b24fb291e92e9c3

resolved conflicts for merge of 9eecf3fc to master

Change-Id: If38c80cd560d8b419420fc05a872c31b6031d90a

build/Android.mk

diff --git a/build/Android.mk b/build/Android.mk
index 9707881..cb2dcfb 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -123,7 +123,9 @@
     android-support-v7-gridlayout \
     android-support-v7-appcompat \
     android-support-v7-mediarouter \
+    android-support-v7-recyclerview \
     android-support-v13 \
+    android-support-v17-leanback \
     android-support-multidex \
     android-support-multidex-instrumentation
 

build/sdk.atree

diff --git a/build/sdk.atree b/build/sdk.atree
index 3d2b505..a91891c 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -389,6 +389,19 @@
 
 development/samples/Support7Demos                                                                 extras/android/support/samples/Support7Demos
 
+# 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
+${OUT_DIR}/target/common/obj/PACKAGING/android-support-v7-recyclerview_intermediates/android-support-v7-recyclerview.jar    extras/android/support/v7/recyclerview/android-support-v7-recyclerview.jar
+
+frameworks/support/v17/leanback/README.txt                                                        extras/android/support/v17/leanback/README.txt
+frameworks/support/v17/leanback/.project                                                          extras/android/support/v17/leanback/.project
+frameworks/support/v17/leanback/.classpath                                                        extras/android/support/v17/leanback/.classpath
+frameworks/support/v17/leanback/AndroidManifest.xml                                               extras/android/support/v17/leanback/AndroidManifest.xml
+frameworks/support/v17/leanback/project.properties                                                extras/android/support/v17/leanback/project.properties
+frameworks/support/v17/leanback/res                                                               extras/android/support/v17/leanback/res
+${OUT_DIR}/target/common/obj/PACKAGING/android-support-v17-leanback_intermediates/android-support-v17-leanback.jar    extras/android/support/v17/leanback/libs/android-support-v17-leanback.jar
+
 ##############################################################################
 # Tests Component
 ##############################################################################