summaryrefslogtreecommitdiffstats
path: root/test-runner/src
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2014-03-14 00:23:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-14 00:23:10 +0000
commit87dbf308fcde409a73921a6da95d93bcb5e8c106 (patch)
tree4bf123f5deaf0a702347ef63b0f398bcaa4c521b /test-runner/src
parent25e41f4345c2e58e31c0e32507b6475107d9a286 (diff)
parent83b31aae81402c2b10bd711bc14c6ebdfe4c85bf (diff)
downloadframeworks_base-87dbf308fcde409a73921a6da95d93bcb5e8c106.zip
frameworks_base-87dbf308fcde409a73921a6da95d93bcb5e8c106.tar.gz
frameworks_base-87dbf308fcde409a73921a6da95d93bcb5e8c106.tar.bz2
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
Diffstat (limited to 'test-runner/src')
0 files changed, 0 insertions, 0 deletions