reconcile froyo-release into gingerbread

Change-Id: I5b2492a62bab246a41ad43f45f7a1d4c13b15985