| commit | af69e81834d09a02a6bfe1b685e66cd007243373 | [log] [tgz] |
|---|---|---|
| author | Chong Zhang <chz@google.com> | Fri Apr 03 23:38:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 03 23:38:52 2015 +0000 |
| tree | 4c2cbb428c9d0fdafec7ce53aa52da292fee72ec | |
| parent | 175802940e30d2ae7bbf36656f08d47067c0a069 [diff] | |
| parent | 4ea8ecf7bfa54ea6440f833cc9f9c475779860e4 [diff] |
am 4ea8ecf7: (-s ours) am f7f62b7e: (-s ours) Merge "nuplayer: do not use cached source for wvm content -- DO NOT MERGE" * commit '4ea8ecf7bfa54ea6440f833cc9f9c475779860e4': nuplayer: do not use cached source for wvm content -- DO NOT MERGE