Commit From Master
Commit From Git Extensions
Commit From Git
Merge http://github.com/anilbojja/Andriod

Conflicts:
	proguard-project.txt