tree 4bf123f5deaf0a702347ef63b0f398bcaa4c521b
parent 25e41f4345c2e58e31c0e32507b6475107d9a286
parent 83b31aae81402c2b10bd711bc14c6ebdfe4c85bf
author Christopher Tate <ctate@google.com> 1394756590 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394756590 +0000

am 83b31aae: (-s ours) am d5b25cbd: am aaaeb6a2: am 87503f85: am e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev

* commit '83b31aae81402c2b10bd711bc14c6ebdfe4c85bf':
  DO NOT MERGE - Don't hang installs if the transport disappears