reconcile froyo-release into gingerbread

Change-Id: I4c6d47421ed7a26b65f4f2df105d8375fcc3d840