7 Commits

Author	SHA1	Message	Date
Trevor Johns	682c24e228	Resolve merge conflicts of a5060ee to nyc-dev ... This undoes the automerger skip which occured in commit e740c84dc3 and replays it as a standard (NOT -s ours) merge. Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086	2016-04-19 02:03:59 -07:00
Scott Rowe	ab8c34ffc4	docs: Building Live TV Apps ... Change-Id: I8d0015e6c8a8a24c661434ca5cf88defd27ae8cf	2015-04-01 12:06:08 -07:00
Scott Rowe	da0c5de5fa	docs: Card View for Android TV training ... Change-Id: I4797c0b3c4ae7106349095016d778992802ccb96	2015-01-29 10:50:25 -08:00
Scott Rowe	8443fad483	docs: Add screenshot ... Change-Id: I0995d23e1df30ce17ce381c14a6cbd2de389c396	2015-01-12 14:50:50 -08:00
Scott Rowe	ea7a71b25d	docs: b/18122848 [DAC] Android TV - Recommendation card ... Change-Id: I3347254ae659e4edc7a07aa30b276bd24636db17	2014-12-19 16:11:58 -08:00
Joe Fernandez	7213656f98	docs: Android TV docs fixes for L SDK release ... Change-Id: Ie37c2056844e1c04542ed4e556a6577640e13819	2014-10-17 00:35:50 -07:00
Andrew Solovay	bab257453b	Moved TV Input Framework (TIF) page out of preview. ... See first comment on CL for the doc staging location. Setting up a redirect for the old page with CL http://ag/566783 Change-Id: Ibd391cb3fe357495ecf3dc70b1edeadee12075f3	2014-10-15 10:10:11 -07:00