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

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