Jae Seo 488f2e896b resolve merge conflicts of 7966cf7 to nyc-dev-plus-aosp ...

Change-Id: I44e0c5ee194d1fe60ff53ea2cc5477283b342821

2016-04-21 10:46:07 -07:00

..

res

Support7Demos: Enable the route discovery action only when needed

2016-03-24 16:33:24 +09:00

src/com/example/android/supportv7

Support7Demos: Add an override annotation

2016-03-24 16:58:12 +09:00

_index.html

Move media router samples to new Support7Demos project.

2013-03-20 18:20:18 -07:00

Android.mk

resolve merge conflicts of 7966cf7 to nyc-dev-plus-aosp

2016-04-21 10:46:07 -07:00

AndroidManifest.xml

Make CardViewActivity in Support7Demos extend AppCompatActivity.

2016-03-02 14:20:08 -08:00