http://review.cyanogenmod.org/#/c/29240/
Merge remote-tracking branch 'cmx/gingerbread' into gingerbread