Merge \\"Update a string.\\" into nyc-mr1-dev am: dca2b18c15
am: 95f8995c85

Change-Id: I436f43c66222c7b330919b0b1eef9794a17755e4
tree: 3d73c33cd2b34be21d53ca9123950ad81c20a44d
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml