tree ea11d7e967235c337ba921d2ede6e283f3113c60
parent 4e9fba639b7a5a29e957048f037b23781796161a
parent 7ed9e5609ddb8eac13f28588cf6535f1dd1187ea
author android-build-prod (mdb) <android-build-team-robot@google.com> 1516311432 +0000
committer android-build-prod (mdb) <android-build-team-robot@google.com> 1516311432 +0000

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

Change-Id: Ib378fb14acd8a7e4b3a8d0251ebec09946cb5274