am 030b0ebe: merge from froyo-plus-aosp