reconcile froyo-release into gingerbread

Change-Id: I1f6934f548802643a03aba5fee0b13eb942b184c