summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2015-04-03 23:28:39 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-03 23:28:39 +0000
commit4ea8ecf7bfa54ea6440f833cc9f9c475779860e4 (patch)
treeec0f96c66e44c39e83800bb7a02792ab57781e99
parent8b0b1f77606c3e81b9a5d5d2b78fdac68df33ada (diff)
parentf7f62b7ec23cc265c72b49f7f67886253b27c48f (diff)
downloadframeworks_av-4ea8ecf7bfa54ea6440f833cc9f9c475779860e4.zip
frameworks_av-4ea8ecf7bfa54ea6440f833cc9f9c475779860e4.tar.gz
frameworks_av-4ea8ecf7bfa54ea6440f833cc9f9c475779860e4.tar.bz2
am f7f62b7e: (-s ours) Merge "nuplayer: do not use cached source for wvm content -- DO NOT MERGE"
* commit 'f7f62b7ec23cc265c72b49f7f67886253b27c48f': nuplayer: do not use cached source for wvm content -- DO NOT MERGE
0 files changed, 0 insertions, 0 deletions