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

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