tree 4d4d196d0cb942f2a6eacd820da58a04aa5a028f
parent dd1cca6d5e0d5275a73d23eb356b7805a34793b0
parent abf54a61bc103df4aa108adabcb3fa1fc03bb911
author Hassan Shojania <shojania@google.com> 1492811705 +0000
committer android-build-merger <android-build-merger@google.com> 1492811705 +0000

Merge "Fix for MediaPlayerStreamingStressTest/HLS" into oc-dev am: a72902a079
am: abf54a61bc

Change-Id: I1b5e5717811398e6f2b7b2c1edd6008cdf75754d