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
Dirk Dougherty	c85bf85941	Doc change: Updates to preview program overview and tags. ... Change-Id: I60db437ea5aabe3fad0284726d0e3850828c92a3	2015-05-26 14:41:15 -07:00
Dirk Dougherty	7470945396	Doc change: adjust distribute and preview card grids and styles. ... Change-Id: I0b0fd5688c5efdb881d677173afdfb5f63d2fa73	2015-05-17 20:36:16 -07:00
Dirk Dougherty	98794c012c	Doc change: add new engagement and other distribute files. ... Change-Id: I1c80d134b6637db9f763b6a587cdc5817a66b9be	2015-05-12 20:42:10 -07:00
smain@google.com	0aba9daacd	fix distribute nav styles. they were not highlighted correctly. ... Change-Id: I53f727353d263eb8caa62261751be3adcdc18273	2014-12-10 12:45:02 -08:00
Dirk Dougherty	bdcd6fc777	Doc change: Update monetization docs. ... Change-Id: Ic34c1a08f8b7bcd271ad53f31c62d0bab82fc053	2014-06-11 17:52:07 -07:00
Dirk Dougherty	3506ac87c0	Doc change: Updated content for distribute. ... Change-Id: I612fbb8e5b7aedd73c0e633e5517bb89375760ed	2014-05-14 14:10:51 -07:00