tree cb59c8a24de0ea7e792ed9a638762a5b8c444104
parent ff82f3391594c3256b25eae4fbee4103ba308cc1
parent 7754e2569490f73a84ae31d79b8aa7add2efcb06
author Hall Liu <hallliu@google.com> 1503507957 +0000
committer android-build-merger <android-build-merger@google.com> 1503507957 +0000

Merge "Embms API adjustments for 7/21" am: 489dcb7cca am: 488d3bf786
am: 7754e25694

Change-Id: I2724aab757b94957dd9174e4b86c48952a59ebdc