tree 7df56a6e6bd3cc13454b6c7da8d1cd4c3afad142
parent 4e19d1bea945a36cf184ba32afa46079077be9a0
parent 3e58025f05790e840f1c649d291a3f670184d3df
author Hall Liu <hallliu@google.com> 1494964611 +0000
committer android-build-merger <android-build-merger@google.com> 1494964611 +0000

Merge "Flesh out streaming service management in service" am: 0268750a94
am: 3e58025f05

Change-Id: Ic62dc4341f09ae325d1de7c6dc58cfad486a959f