tree a1c3000d33d73adebb4a24b788019009de78ba60
parent f876b18295d3e5d9a3ce8d0be59694e4635d6024
parent 3248cb7dd030d9b45362c1c0364763419be9064c
author Chong Zhang <chz@google.com> 1428105187 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428105187 +0000

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

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