Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1