Conflicts: samples/browseable/ActivityInstrumentation/_index.jd samples/browseable/TextLinkify/_index.jd Change-Id: Ia9a333bd09d2e7e9417a560581c40bd02d295c12
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.