tree f34e553043400c7757200152f9b24ae8bc851619
parent 9839016b91d08d748eebafa894cdd6213828f2bd
parent e399a02f1ad5bf938eccd16bb5a50ec39e3b150a
author android-build-prod (mdb) <android-build-team-robot@google.com> 1524664513 +0000
committer android-build-prod (mdb) <android-build-team-robot@google.com> 1524664513 +0000

Snap for 4742793 from e399a02f1ad5bf938eccd16bb5a50ec39e3b150a to emu-2.7-release

Change-Id: I171f09195a7e3f84dd3c5deb5330917c317b7ee0