Merge "Fix shortcut action text length issues." into mnc-dev
tree: f6c6bda048e7d1094b6d1af3e310608af761d6c4
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags