Change-Id: Iaa5b66a2eda07fd9de4ea613209226dd4ee64abd Conflicts: samples/ApiDemos/AndroidManifest.xml
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.