Update strings.

Merge some string as well, requiring merging of ids.

Change-Id: I66ac83a32c3d108ff8fda70d466bd2bac45152ea
6 files changed
tree: cdb5b4b3f3cc22c46ccea1f0dfcc1342198d7dee
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml