Merge "Update string reference." into mnc-dev
tree: 425caeb77b4bc302080aadb4d0f39eff7ad828ac
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags