tree 698456eb503f96fb9be4e6d070d6d60c5e33bb93
parent eac4be7ef28a9dfba9e6cc6d0501b4bd2146041a
parent 9c902ca4732f8c2a5afda4047415d1de6d3db493
author John Spurlock <jspurlock@google.com> 1354667695 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354667695 -0800

am 9c902ca4: am 33669f35: Merge "Kill dreams that do not create a timely service connection." into jb-mr1.1-dev

* commit '9c902ca4732f8c2a5afda4047415d1de6d3db493':
  Kill dreams that do not create a timely service connection.