Android-holo theme px to em
Cleanup
Merge branch 'theme-cleanups' into develop