commit | c8056cb87f14d37294a8078ccc34b9e105a97afc | [log] [tgz] |
---|---|---|
author | Robert Shih <robertshih@google.com> | Wed May 08 16:49:10 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed May 08 16:49:10 2019 -0700 |
tree | 5fad2544636733279f912c0d6848cb92d27adaee | |
parent | 4cafd46de4756df6b8c74c8a89a30853ae7eac53 [diff] | |
parent | 5d020b31c8e3c32d2c2f017168a693a3234d1901 [diff] |
Merge "[automerger skipped] Merge "StreamingMediaPlayerTest: make HLS tests local" into nougat-cts-dev am: c59177cf6a -s ours am: 5d020b31c8 -s ours am skip reason: change_id I164c0a64287bafd4b97209832d6015a22d4ef59e with SHA1 589fe4ff98 is in history Change-Id: I1e2f198fcabfa58d3c60124acb9d3c7792db3e73