reconcile froyo-release into gingerbread

Change-Id: I0cd475594cd7697ee681bfc7eb76d61bec236417