am 25f0c808: am 96a9f357: Merge "Fix unintentional setup step advance in orientation change"

* commit '25f0c8089eecfcded7f41c66453bd874ba92219a':
  am 96a9f357: Merge "Fix unintentional setup step advance in orientation change"
tree: bc243ba2cd233842158f3be6575c178bfc0c947f
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk