tree 3f694d33cfb5d81f4a48eb07e7ff620048a581f2
parent e0acd7d8e392620ac5eff47a3eab6b01a5f24ae0
parent 7ccbecd4db5e173c2b2cf46d77b1cfb4b4f3507b
author android-build-prod (mdb) <android-build-team-robot@google.com> 1516311490 +0000
committer android-build-prod (mdb) <android-build-team-robot@google.com> 1516311490 +0000

Snap for 4552601 from 7ccbecd4db5e173c2b2cf46d77b1cfb4b4f3507b to emu-2.6-release

Change-Id: I71d8a83c65e6336222674d6b3b31f80b7964f404