tree 7147d39e042bd7b4f06867168178322b811e1d65
parent e7ba1ae010b69dc1b2d7ae91d602d967720c64af
parent 842c5d9553f3f8e97d04ed1bd0d37e4851240654
author Glenn Kasten <gkasten@google.com> 1348679324 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348679324 -0700

am 842c5d95: Revert "Don\'t wait for presentation complete if terminated"

* commit '842c5d9553f3f8e97d04ed1bd0d37e4851240654':
  Revert "Don't wait for presentation complete if terminated"