Files
android_development/samples
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
..
2011-10-17 18:49:50 -07:00
2011-07-15 17:31:33 -07:00
2013-09-23 16:05:44 -07:00
2013-04-09 21:42:59 -07:00
2011-11-28 17:21:34 -08:00
2011-05-03 17:56:51 -04:00
2012-04-18 17:18:24 -07:00

Adding a new folder in development/samples is not enough to have it
be packaged with the SDK.

Make sure to edit development/build/sdk.atree to add the sample to the SDK
build.