tree a862e9116725a051744c3649fa549e9362a95785
parent 6394834d5262d2847908c6ef8c4d7faf7e054575
parent b85e5ba482fd62ee1441e22058a70e0cd27372df
author Bo Hu <bohu@google.com> 1490415119 +0000
committer android-build-merger <android-build-merger@google.com> 1490415119 +0000

Merge "Upgrade emulator kernels"
am: b85e5ba482

Change-Id: I81c7015af42bf4151a8cb2f05fdc11274a1dcfc2