Merge "Changing the wording on the currently logged in user."
tree: 4fbcbf9166c65543db7e5547bf83a081953a6283
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml