tree 4c2cbb428c9d0fdafec7ce53aa52da292fee72ec
parent 7f6655dfa1bf2e7740129ca99e08fe0b8bdc290e
parent af69e81834d09a02a6bfe1b685e66cd007243373
author Chong Zhang <chz@google.com> 1428104893 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428104893 +0000

am af69e818: am 4ea8ecf7: (-s ours) am f7f62b7e: (-s ours) Merge "nuplayer: do not use cached source for wvm content -- DO NOT MERGE"

* commit 'af69e81834d09a02a6bfe1b685e66cd007243373':
  nuplayer: do not use cached source for wvm content -- DO NOT MERGE