tree a6a92d50e2d351a42faac1d856a3b635c708293f
parent a74425d9c61f7316d75ebce2dcac7e722cacea22
parent 281edb4ebce9b31a06a10bf2bdbad330847b4e5d
author Hall Liu <hallliu@google.com> 1497902634 +0000
committer android-build-merger <android-build-merger@google.com> 1497902634 +0000

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

Change-Id: I40ac9866f13f0ab233894b855b0786a322e3d56d