[automerger skipped] DO NOT MERGE Move UserCallback to ClusterRenderingService. am: edf29d0020 -s ours am: 8293703a21 am: 9afde85efa am: faaa2af6c3
am: 15ec001979 -s ours
am skip reason: subject contains skip directive

Change-Id: Ief12f6931354a5d9e0afeca354617b4e9beaf062
tree: 65411c16a32a1c342346bcfa9fdcb536f983c5ed
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml