[automerger skipped] DO NOT MERGE Fix the issue that Cluster-showing when switching a user. am: 71830ca5bd -s ours
am skip reason: subject contains skip directive

Change-Id: Ibe33e9b995277f832bf3e10eeb3a9dc7fd6a087b
tree: 762ad95e62cc81afc104d47aa4bb9daa6d6b61cd
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml