tree 3113a63a5f10425d462d3f0e2b889bd3df514a68
parent caac5df32539d4c0af8e38539b9af0a2c6bbe311
parent 2cd6464e9bbd3a381ae827a3dc13e8c86d577654
author Hall Liu <hallliu@google.com> 1510622202 +0000
committer android-build-merger <android-build-merger@google.com> 1510622202 +0000

Merge changes from topics "embms-cts-6", "embms-cts-5" am: f6b2b77e40
am: 2cd6464e9b

Change-Id: I33811f8c6198da52d7ec5a863528e8c6ed723f2d