tree f9f7aec2ece760c5aaff4495419ac16d0a6ddac3
parent 058a7525025baaa1a8a1ce5922d414260a9529f6
parent 3424136a59167169b7a65a5b4ee8cdfd52235986
author Hall Liu <hallliu@google.com> 1513904054 +0000
committer android-build-merger <android-build-merger@google.com> 1513904054 +0000

Merge "Add feature flag and EMBMS bug fixes" am: 465f2916e0
am: 3424136a59

Change-Id: Iebc092e58752f32b6abfad612901ae094e083449