tree 3cfe3df58b2c7c396909972c8593b36927135a2f
parent 2d81cb6824e186a6c76d0466e2d58eaa34312673
parent 343e291b67432427709a20e97f42fbc329c45c44
author Olawale Ogunwale <ogunwale@google.com> 1428540987 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428540987 +0000

am 343e291b: am e8a3c320: Merge "Prevent windows from freezing screen while timeout"

* commit '343e291b67432427709a20e97f42fbc329c45c44':
  Prevent windows from freezing screen while timeout