am 73770f4f: am a5257b49: am bde60852: Merge "Change strings as per updated mocks." into lmp-dev

* commit '73770f4f16f19b45dc8f01556bb3053eaa0c82dd':
tree: 648b1d3d905516553b8a4d7062ab5a96d317d54b
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml