Merge "Remove a high surrogate after a delete if any" into jb-dev
tree: f791d2f83d3318defdd50cea3348f9f35465e7df
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk