modified:   default.xml
Merge branch 'jellybean' of https://github.com/mortaromarcello/android into jellybean