Merge "Allow more lines in the summary of the preferences" into nyc-dev
tree: c78c6d3555eabada3d125aa09f566448f3d0174a
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml