...
...
 yes Merge branch '4.2.2' of https://github.com/htomasz/android-manifest into 4.2.2

Conflicts:
	default.xml
....