Merge "Don't say UTF-8 in an error message when we mean Modified UTF-8." into dalvik-dev
tree: e9fc3b127b2a0c7466041f8c4e74b8d5c6257149
  1. build/
  2. oat_process/
  3. oat_runtime/
  4. src/
  5. test/
  6. tools/
  7. Android.mk