Merge "Fix failed unit test due to resource string change" into jb-mr2-dev
tree: d9cd5b2062d254de08d233565c762c726f483234
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk