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 e740c84dc32180214a7fd157105d6c18d30408ee and replays it as a standard (NOT -s ours) merge. Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086	2016-04-19 02:03:59 -07:00
Joe Malin	45edbb701a	DOC CHANGE: FileProvider training class ... Change-Id: Idad8840dec02150733f23cfefdeaf152a260f63a	2013-10-11 16:48:18 -07:00
Adam Koch	909fe93021	Minor tweaks to Sharing class, updated some typos, wording and a screenshot. ... Change-Id: If456e812e8627d2cc361e1ad0d42439cbd53d43c	2011-12-15 17:56:31 -05:00
Scott Main	70645e363e	Docs: Add class for Sharing Content ... Change-Id: I078a02d952e652c16f84e1b3f7613f3dc9364c97	2011-12-14 13:18:37 -08:00