Merge "Add Rerouting status to Cluster am: 81c598de4a am: c2c69f0f54 am: 79fa21c0a2 am: aa973750b1" into qt-qpr1-dev-plus-aosp
am: 1a25c8cdeb

Change-Id: I169555d001abd82811f44d7be0de267a166401a9
tree: ee0694fcdc08ac8177afa010213ef823d3138a19
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml