[automerger skipped] DO NOT MERGE Make Cluster configurable to use Navigation only. am: f7597f91fa -s ours am: 2e186409ae
am: 9bfe396c29

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