tree b349dd306f77259f5fce475e4178874eed293b45
parent c48e3d03436bd428ef5425114ea138ae097f1f20
parent aaaeb6a21bb6cc540fefa6868493bda612a63f22
author Christopher Tate <ctate@google.com> 1394733765 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394733765 +0000

am aaaeb6a2: am 87503f85: am e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev

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