5 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
David Friedman	e6705bf25d	Docs: Creating interactive watch faces ... Bug: 21721463 Training module and related API-reference documentation. This is new material for Android Wear D(iamond) release. Change-Id: I9959bca50fd96812abd7cfb693139986bc59b133	2015-08-19 17:41:57 -07:00
Luan Nguyen	c14dce738e	docs: Regen wearable docs with new redesign templates ... bug:21497653 Change-Id: I7fd0058a14d4adcd14fd584bb10a777987169823	2015-05-29 11:23:15 -07:00
Luan Nguyen	917a2f26b7	docs: Refresh Wearable support library reference for Diamond ... Change-Id: Id22e676fdda060a954e0d189c90ce11162def08b	2015-05-01 09:29:01 -07:00
Ricardo Cervera	e229751d11	docs: Add browseable Wearable Support Lib Javadoc ... Change-Id: Ied1f25f637c529046b0adc1e1ea173a290b22da1	2015-01-16 11:18:10 -08:00