Merge "changelog, droid rc5" into froyo