am 5b61f1d2: am 584e0fd6: am a798a16a: am 6d3d5395: Merge "Fix a bug: wrong parent position is written when moving."

* commit '5b61f1d2490bc73913dd02d17f2a771b4e5a7d51':
tree: 12a3e9141ce5abddead7b5b7fb9db01153db6175
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk