am 6435c800: Merge "Fix an issue on the transition between the setup and the settings"

* commit '6435c80087b1c698e025b7be809d6236fcdd9e64':
  Fix an issue on the transition between the setup and the settings
tree: dd2e297f6d5921d6ef26f2847179ecd51c5ca35c
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk