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 e740c84dc32180214a7fd157105d6c18d30408ee and replays it as a standard (NOT -s ours) merge. Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086	2016-04-19 02:03:59 -07:00
Neil Fuller	71fbb81b14	Fix @code escapes ... The body of {@code} must not be HTML escaped. This is one of several changes that fix the source in conjunction with a doclava fix. Bug: 25757239 Change-Id: Ib38a0fa2dd2a3d68e467f78a812071e763d7e881	2015-12-02 14:24:11 +00:00
smain@google.com	852e0e347a	add tags for wakelock and other API names ... Change-Id: Ic9831165d38b3f9642bc14fca2271c8506550ff4	2015-02-13 09:58:42 -08:00
Katie McCormick	43750f19e7	am b8645efb: am caec59c1: am d2e6c89a: am 0a96a82b: am 0cb2c76b: Merge "Doc update: clarify best practices." into klp-docs ... * commit 'b8645efbc8b7f57168d1f5108b65e5bea576b1d1': Doc update: clarify best practices.	2014-02-11 20:35:01 +00:00
Katie McCormick	49f93486a9	Doc update: clarify best practices. ... Fix for: b/12515292 Change-Id: I1616d41c052582ff6c82b87cd0282cf1d25bb84d	2014-02-10 19:06:17 -08:00
Joe Fernandez	33baa5ad7d	Removing quotes from page.tags values ... Change-Id: I9e12079568ef7be8574743a34856ed2839e1e76a	2013-11-14 21:00:10 +00:00
Katie McCormick	7bdb3f6997	New Scheduling class. ... Change-Id: Iadd9d0d1d3bb8fa6a145d68ee28ae9912a6a9f4c	2013-09-23 10:02:20 -07:00