OSDN Git Service

Merge "Fix for MediaPlayerStreamingStressTest/HLS" into oc-dev am: a72902a079
authorHassan Shojania <shojania@google.com>
Fri, 21 Apr 2017 21:55:05 +0000 (21:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 21 Apr 2017 21:55:05 +0000 (21:55 +0000)
commite106ca51868dd35f0df3f373fb938798ec48a4e7
tree4d4d196d0cb942f2a6eacd820da58a04aa5a028f
parentdd1cca6d5e0d5275a73d23eb356b7805a34793b0
parentabf54a61bc103df4aa108adabcb3fa1fc03bb911
Merge "Fix for MediaPlayerStreamingStressTest/HLS" into oc-dev am: a72902a079
am: abf54a61bc

Change-Id: I1b5e5717811398e6f2b7b2c1edd6008cdf75754d