local modification to build successfuly
Merge branch 'master' of https://github.com/k9mail/k-9
uml test