tree fb0ff91a7c4521977d40e71174ddf97d99c9265a
parent fb8b2d34496c5fd2e78619af1653fbb0ff3b7ba3
parent 38658c5c61fc1e9eb2722737737fc7cdac5bb803
author android-build-prod (mdb) <android-build-team-robot@google.com> 1538702792 +0000
committer android-build-prod (mdb) <android-build-team-robot@google.com> 1538702792 +0000

Snap for 5050328 from 38658c5c61fc1e9eb2722737737fc7cdac5bb803 to emu-3.0-release

Change-Id: I149ad0d34fb1852a2696f214c55cc04c9fb8c5fe