Merge "Making sure that different users have different icons."
tree: 526f1d3eeb00cddf4b46fa96041b401b140edd90
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml