am 4334d3b8: Merge "Fix name matching bug with non space separators" into jb-mr2-dev

* commit '4334d3b852e369b591f591e66e493cc92a721233':
  Fix name matching bug with non space separators
tree: ca1e51e86da316c6cef68df7ba0dc63053aa9f02
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags