tree 325f086e6e273a7b4c6ffd9986821003c650f0f8
parent 91f6aaaf2cb1c1a0cec129cec8038332de0271a8
parent 4dcf1af3ed8dfa546e6cbf5ecfa66914a3fda883
author Craig Mautner <cmautner@google.com> 1387475733 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1387475733 -0800

am 4dcf1af3: am cccf2a33: Merge "Keydispatching timeout while finish Activity"

* commit '4dcf1af3ed8dfa546e6cbf5ecfa66914a3fda883':
  Keydispatching timeout while finish Activity