summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2014-03-13 18:08:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-13 18:08:49 +0000
commit83b31aae81402c2b10bd711bc14c6ebdfe4c85bf (patch)
treec81422fc0f1e0f44a8285db8722178691581cf9f /core/java
parente4f1c8ab271c06c03d7b962efed9a669f3c8986b (diff)
parentd5b25cbd570680c361da8807fdfddf135472d338 (diff)
downloadframeworks_base-83b31aae81402c2b10bd711bc14c6ebdfe4c85bf.zip
frameworks_base-83b31aae81402c2b10bd711bc14c6ebdfe4c85bf.tar.gz
frameworks_base-83b31aae81402c2b10bd711bc14c6ebdfe4c85bf.tar.bz2
am d5b25cbd: am aaaeb6a2: am 87503f85: am e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev
* commit 'd5b25cbd570680c361da8807fdfddf135472d338': DO NOT MERGE - Don't hang installs if the transport disappears
Diffstat (limited to 'core/java')
0 files changed, 0 insertions, 0 deletions