Merge "one: Add Geeksphone ONE product" into froyo