Merge "Update a string." into nyc-mr1-dev
tree: 3d73c33cd2b34be21d53ca9123950ad81c20a44d
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml