AOGP/android — pull request #2 by hashem78 (2014-10-23 18:00:31+00:00)
Title: Fix the mess over here , now pushing will be easier .

guys , please merge this , since pushing will be easier and it tides up things .