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

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