[automerger skipped] DO NOT MERGE Make Cluster configurable to use Navigation only.
am: f7597f91fa -s ours
am skip reason: subject contains skip directive

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