tree eccff2eb3f2bc2bbc821b0a296d864433e161bbb
parent 1241f25bcbab4b4a8e9b818705829dff33ad7c63
parent 0941ae732d4e640fd3df0d156a2a78f64992470a
author Robert Shih <robertshih@google.com> 1527637510 -0700
committer android-build-merger <android-build-merger@google.com> 1527637510 -0700

Merge "httplive: live streaming initialization NULL check" into oc-dev am: e4aa5e88b2
am: 0941ae732d

Change-Id: I23b045f8b3a51f4e4ab6d7c55d68e2c3551c5f4b