Resolved merge problem
Added EmoticonRowItem class
added xml file for custom row view. Added custom emoticon row
Added unit test for emoticonlistviewadapter
Updated unit test for emoticonlistviewadapter