tree d6cbdae9db2a74f3c73681bcebf4acf328b38731
parent 0f76b9ad711221725b8b7fa1d2f396a35e8daeb2
parent 90abcc94258ba9d9c8b68ac9764b6ab1eba12985
author Ed Heyl <ed@google.com> 1343253412 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343253412 -0700

am 90abcc94: resolved conflicts w/0ede734d0780a968c9c345f99a18f9f8b9fc02cd

* commit '90abcc94258ba9d9c8b68ac9764b6ab1eba12985':
  Ensuring that restoreInstanceState is being called promptly for synchronously bound page