[automerger skipped] DO NOT MERGE Make Cluster configurable to use Navigation only. am: f7597f91fa -s ours am: 2e186409ae am: 9bfe396c29 am: 97d97bc8ed
am: ee87a54c03 -s ours
am skip reason: subject contains skip directive

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