tree feb2af365725f096ae0cdc359111a77501393156
parent e6b2ddd49bc399cf79e70ae65d314e76d3ce88fe
parent cf2b2ec7eb5cb3158a2806ac6d7a7f36b3f30b9e
author Hall Liu <hallliu@google.com> 1497903379 +0000
committer android-build-merger <android-build-merger@google.com> 1497903379 +0000

Merge changes from topics 'embms-init-fix', 'embms-download-2' am: 281edb4ebc
am: cf2b2ec7eb

Change-Id: I5b8b4985ad4201519bf5fc8b987240cde77edc69