Merge "CHANGELOG" into froyo