am 8ce65243: am 2debf168: Merge commit \'5df8b42709662b0e599019e4fd17c4e153ff6b47\' into HEAD

* commit '8ce65243e7891d0f23e3783f6bb89db418b9db06':
tree: b38920c86dae333a54090fb50c1d4e475ef73710
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk