almost
Merge branch 'master' of https://github.com/NickAndroid/PermManager

Conflicts:
	Android.mk