tree 6722a2a52983e523d925696939893779212bb0ee
parent e6fac0df113b04db68a065242bdcee1faee917b4
parent 84f992a249491b9f755e879bf096baac3f9472f5
author Jean-Baptiste Queru <jbq@google.com> 1283966921 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283966921 -0700

am 84f992a2: resolve conflicts

Merge commit '84f992a249491b9f755e879bf096baac3f9472f5'

* commit '84f992a249491b9f755e879bf096baac3f9472f5':
  Adding Download Manager Integration, stress, and hosts-based tests.