Although I'm in the tabs camp, Smack uses mostly spaces. Therefore it is the logical choice for the indentation style.
on package layer instead of Declarative Service (DS) approach. Restructuring and cleanup of initialization process to ensure that all internal config files are found by the corresponding bundle classloaders. SMACK-343
Use Android's Base64 implementation when on Android, otherwise, when on Java7, use the existing one.