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

..

app-browse.png

docs: Card View for Android TV training

2015-01-29 10:50:25 -08:00

card-view.png

docs: Card View for Android TV training

2015-01-29 10:50:25 -08:00

channel-info.png

docs: Building Live TV Apps

2015-04-01 12:06:08 -07:00

custom-head.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

deep-link.png

docs: Add screenshot

2015-01-12 14:50:50 -08:00

do-not-attempt.png

docs: Building Live TV Apps

2015-04-01 12:06:08 -07:00

home-recommendations.png

…

prog-guide.png

docs: Building Live TV Apps

2015-04-01 12:06:08 -07:00

recommend-card.png

docs: b/18122848 [DAC] Android TV - Recommendation card

2014-12-19 16:11:58 -08:00

tv-tif-overview.png

…

tvinput-life.png

docs: Building Live TV Apps

2015-04-01 12:06:08 -07:00