Commit Graph

5 Commits

Author SHA1 Message Date
quddusc
60737e9507 Merge commit '3943cdc9' into manualmerge2
Conflicts:
	samples/browseable/ActivityInstrumentation/_index.jd
	samples/browseable/TextLinkify/_index.jd

Change-Id: Ia9a333bd09d2e7e9417a560581c40bd02d295c12
2013-11-01 19:17:20 -07:00
Dirk Dougherty
cc1867bc5b Fix broken javadoc reference.
Change-Id: I6b39015c340894715b3b24980ca0241a5e8f2a5a
2013-10-31 05:45:54 -07:00
quddusc
11d2eef36f Updated browsable sample descriptions.
Change-Id: I21e3dfacb4bc1acfbe3b17c5f8001ee758f9eec2
(cherry picked from commit 3943cdc962)
2013-10-31 11:55:15 +00:00
quddusc
3943cdc962 Updated browsable sample descriptions.
Change-Id: I21e3dfacb4bc1acfbe3b17c5f8001ee758f9eec2
2013-10-30 20:51:43 -07:00
Dirk Dougherty
4b737b695e Add prebuilt browseable samples as static files.
Change-Id: Ifb5382223343400882834d2dd9c182c3df602e34
2013-10-29 20:56:17 -07:00