Initial android pages commit
Resolving an unmerged into 'master'conflict