am feddb49c: Merge "Fix shortcut action text length issues." into mnc-dev

* commit 'feddb49ced2eb10328f9f3db52c950668472ffef':
  Fix shortcut action text length issues.
tree: 5be7156ac74c0e9b659fa93dba4215a11d811963
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags