Merge "Remove 'from the lock screen' from the description" into nyc-dev
tree: c241da0eff8e57983393e630ce520030c09b368b
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml