am efb56934: am 1d50ad79: Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1

* commit 'efb56934efdc0aae38ce7264f2576326293846b6':
  Whoops, forgot the HONEYCOMB_MR1 constant. :(