[automerger skipped] DO NOT MERGE Fix the issue that Cluster-showing when switching a user. am: 71830ca5bd -s ours am: 176d0c54b1 am: 3c33752ce1
am: cd2fc253e6

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