Merge "Updated click changes, and added Arco as Click mantainer" into gingerbread