am 60d2e37b: Merge "Update margins/paddings on the shortcut card." into lmp-preview-dev

* commit '60d2e37b1d4e8b5e957b133fc261dcdabd418932':
  Update margins/paddings on the shortcut card.
tree: c6e429222f7662c782732e12b510ba79b0d6b578
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags