tree cb622af24ff6beccf535194331ee86d00602e939
parent ceb10ba2899ba932026fbc90ff3d9615ba8f3dd3
parent 18b62bdbfe827287ba259011f6b4242126e7fad9
author Andy Huang <ath@google.com> 1414961494 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414961494 +0000

am 18b62bdb: am 07209a3d: am df5192d7: am f9c41264: am 547cc85c: restore peeking state

* commit '18b62bdbfe827287ba259011f6b4242126e7fad9':
  restore peeking state