Merge "Following up on some TODOs etc." into master-nova-dev
tree: ce704bfcb46efe3c76079466feb172a0a50aafa2
  1. libs/
  2. res/
  3. src/
  4. tests/
  5. .classpath
  6. .project
  7. Android.mk
  8. AndroidManifest.xml