tree e1f13c5c64bd82b68e9ec89a5bb8dfbc9b7ccc76
parent 45c8b0980f6503d8a78266c356b497ed996cb871
parent b24d2f0d851d6eb3be273415c10e1d2ccddf4e49
author Hall Liu <hallliu@google.com> 1494379156 +0000
committer android-build-merger <android-build-merger@google.com> 1494379156 +0000

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

Change-Id: I94475218f87c06526f00d7767c81052779eb0add