summaryrefslogtreecommitdiffstats
path: root/media/libmedia/JetPlayer.cpp
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-07-01 07:47:50 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-07-01 07:47:50 -0700
commit2c1648df9d2d623c602fee17048abc82c9e44d55 (patch)
tree31917998e2c06e08c4161aeb7467291fe3ccc305 /media/libmedia/JetPlayer.cpp
parent3b942668596cb7c4d927ffe0d250c69bbaf67386 (diff)
parentf64bd473e4c500dc54923baac7261e6d2d72daa6 (diff)
downloadframeworks_av-2c1648df9d2d623c602fee17048abc82c9e44d55.zip
frameworks_av-2c1648df9d2d623c602fee17048abc82c9e44d55.tar.gz
frameworks_av-2c1648df9d2d623c602fee17048abc82c9e44d55.tar.bz2
am f64bd473: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit 'f64bd473e4c500dc54923baac7261e6d2d72daa6': Update HTTP proxy configuration for all media playback inside stagefright.
Diffstat (limited to 'media/libmedia/JetPlayer.cpp')
0 files changed, 0 insertions, 0 deletions