reconcile froyo-release into gingerbread

Change-Id: I2386774732d4d0d0e46a5791dfc1b8cbeb60494b