Merge "Cleanup logic for showing/hiding shortcuts."
tree: 78aba6a20e180eea1ca426cb55c114263eb77fa8
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags