tree ff45b246d572a7722110cb4b1b6ea4f37f52afe9
parent 3e8607e35fb668345849cc4e96d063d7242968b2
parent 49c59815369616b0fd5451ccabd377e8fe1dc3fa
author Andreas Huber <andih@google.com> 1318276012 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318276012 -0700

am a5da78f0: Merge "YouTube can now request custom cache/prefetch parameters and disconnect-at-highwater"

* commit 'a5da78f09df49ed379028ccaaa383c68dcb58397':
  YouTube can now request custom cache/prefetch parameters and disconnect-at-highwater