e
Merge branch 'jb2' of github.com:MysteriousC/android into jb2