Merge "Prepopulate name preference with user's name" into nyc-dev
tree: f6548529796358c74b273b116e20f43df26fa512
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml