am f72961d0: merge from froyo-plus-aosp