Latest shared
Merge pull request #286 from bhariharan/unstable20

Update to latest shared commit
Add encryption key for template app and sample apps.
Remove extra unused permissions from Manifest files
Merge pull request #287 from bhariharan/sdk_componentization

Fix Manifest permissions and add encryption key implementation.
Fix build scripts, remove rest.xml, add bootconfig.xml
Merge pull request #288 from bhariharan/sdk_componentization

Fix build scripts, remove rest.xml, add bootconfig.xml
Make it simpler to plug in SalesforceSDKManager with initHybrid() and initNative()
Merge pull request #289 from bhariharan/sdk_componentization

Make it simpler to plug in SalesforceSDKManager with initHybrid() and initNative()
Use files from shared repo for hybrid apps
Merge pull request #290 from bhariharan/sdk_componentization

Use files from shared repo for hybrid apps
Merge from upstream
Merge branch 'unstable20' of github.com:/forcedotcom/SalesforceMobileSDK-Android into unstable20
Pointing to latest shared
Pointing to latest shared
Merge pull request #292 from wmathurin/unstable20

Latest shared
Latest shared
Merge pull request #293 from wmathurin/unstable20

Latest shared
First round of test fixes