Merge "Add Torch app to sholes" into froyo