tree ca8901c6919ef27a31bbe669176fd0e11fef2fa6
parent be6b10a507d145b9977f80f792aca323d5744e01
parent ae3a284bc2926a388b68d390c39bddc9aa68e103
author Hall Liu <hallliu@google.com> 1494380915 +0000
committer android-build-merger <android-build-merger@google.com> 1494380915 +0000

Merge "EMBMS test app" am: 3d8fcd7f1a am: b24d2f0d85
am: ae3a284bc2

Change-Id: Ib9bddfde5a2577e62a98ec0aa98e15a79548c7a4