Merge "Fix some build errors" into jb-ub-mail-ur8
tree: c931e8f6c776b13113c0e011c2bbec3efa3a27cf
  1. res/
  2. sample/
  3. src/
  4. .gitignore
  5. Android.mk
  6. AndroidManifest.xml