tree 57a49906057a7ffa86c1fb538a2b2f625392f5a4
parent c41603544877403dd1f2c6a9efc070e3bef26602
parent 910e5751b65163ced4710616d0aa5045937ac2e4
author Hall Liu <hallliu@google.com> 1505341021 +0000
committer android-build-merger <android-build-merger@google.com> 1505341021 +0000

Merge changes from topics "embms-0804-adjustments", "prepare-download-unhide"
am: 910e5751b6

Change-Id: I07e7d0d4d799aded59797e237ec733354f3293df