reconcile froyo-release into gingerbread

Change-Id: I073ede9eadc5c100507c59e625ff70ab193bda76