Merge "Change some strings to fit into 1 line" into nyc-dev
tree: 4802e9e96f876510de88ede3de38c438e5bf19e1
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml