commit | 9c2d9a96cda4ca477982e5b5e955d4f9be853f27 | [log] [tgz] |
---|---|---|
author | Hall Liu <hallliu@google.com> | Fri Sep 08 23:37:03 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Sep 08 23:37:03 2017 +0000 |
tree | 5f1ccc768c913a08af1a905725654903fd0ef7f5 | |
parent | fb9ca1080c7f2484379e9b7e83a082ece2c5c838 [diff] | |
parent | 4ea706b5af77f00d3f37303f7f35515b5da92e23 [diff] |
Merge changes from topics "embms-0728-adjustments", "embms-0721-adjustments", "fix-streaming-api", "mock-unhide-embms-streaming" into oc-mr1-dev am: fff64622ce am: 4ea706b5af Change-Id: I99f233a28af2fab7570fadaa5342ad19e2fd0a57