am 15b65884: Merge "Correctly set visibility of reused shortcut card" into lmp-mr1-dev

* commit '15b658841bd2f289dc79a733ec5f9df497e6239e':
  Correctly set visibility of reused shortcut card
tree: 3ebc1f3a53055172426395da783dc3288c16364d
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags