reconcile froyo-release into gingerbread

Change-Id: I9dec219f7f1c29d9205fef7f8d16977d78265de6