am e2bedb04: am 216777e3: Merge "Use APIs to determine shortcut icon size" into honeycomb

* commit 'e2bedb042a7b9ea1325e1bb26c8df922383e5e26':
  Use APIs to determine shortcut icon size