[automerger skipped] DO NOT MERGE Move UserCallback to ClusterRenderingService. am: edf29d0020 -s ours am: 8293703a21 am: 9afde85efa
am: faaa2af6c3

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