4 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
Mark Doliner	d0646dca40	Small documentation fixes across many files. ... Change-Id: I3e8787ce4bc6018ea1dc9aef2a2cd4e0a8dde663	2014-09-05 13:57:51 -07:00
kmccormick	36b8beec20	Doc update: obsolete ant target. ... "Bug: 8435577" Change-Id: Iaec80cef09f70ccc5d0421b4d2d9a16ada0bd12d	2013-03-29 14:15:10 -07:00
Scott Main	50e990c64f	Massive clobber of all HTML files in developer docs for new site design ... Change-Id: Idc55a0b368c1d2c1e7d4999601b739dd57f08eb3	2012-06-21 21:27:30 -07:00