OSDN Git Service

Merge "Fix for MediaPlayerStreamingStressTest/HLS" into oc-dev
authorHassan Shojania <shojania@google.com>
Fri, 21 Apr 2017 21:42:07 +0000 (21:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 21 Apr 2017 21:42:07 +0000 (21:42 +0000)
commitabf54a61bc103df4aa108adabcb3fa1fc03bb911
tree13ad0e26dcef7f903af8ce5d56c63e4105bbcd36
parent102f3248b832c5d17917918aa219e5cd9ef8ae11
parenta72902a079abd502f2325d21375e9aa7c65d62fe
Merge "Fix for MediaPlayerStreamingStressTest/HLS" into oc-dev
am: a72902a079

Change-Id: I6825cfec699dbe1135ee12df0ce81052d7e57304