tree 537d796362f3114cc968b59c2db99d631b43f06e
parent f1b195fffaf1f41c1d4993ac5862d0472e33886a
parent fff64622ce4259ec983621e2f4d7edc6c7b7318b
author Hall Liu <hallliu@google.com> 1504912862 +0000
committer android-build-merger <android-build-merger@google.com> 1504912862 +0000

Merge changes from topics "embms-0728-adjustments", "embms-0721-adjustments", "fix-streaming-api", "mock-unhide-embms-streaming" into oc-mr1-dev
am: fff64622ce

Change-Id: I10dc080c5cc37c988ee1cdf7695cb291726a95c9