List view xml and test adapter
List view xml and test adapter
initial android changes
merge changes