reconcile froyo-release into gingerbread

Change-Id: If6c3b341b0716ef4f80721da2635b7bde45f453d