reconcile froyo-release into gingerbread

Change-Id: Iec10fc8bafafab638025533501aee04d4acb9f15