am f015f4e1: am d60e42ac: Merge "Major update to HoneycombGallery" into honeycomb

* commit 'f015f4e1a4203004b4b32f4f21fbbdab1954a11f':
  Major update to HoneycombGallery