| commit | 41efeb2b477066d96ad34a048f34fb6fb34213ec | [log] [tgz] |
|---|---|---|
| author | Chong Zhang <chz@google.com> | Fri Apr 03 23:53:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 03 23:53:07 2015 +0000 |
| tree | a1c3000d33d73adebb4a24b788019009de78ba60 | |
| parent | f876b18295d3e5d9a3ce8d0be59694e4635d6024 [diff] | |
| parent | 3248cb7dd030d9b45362c1c0364763419be9064c [diff] |
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