tree ff57db26c2fea8cda4ab9ebbdebcc470485326c5
parent c9ea793119ed472b19f8fcef1755b5fff3e73d27
parent a568b8e1ad4a37a31e5383183102ca904adf1900
author Bo Hu <bohu@google.com> 1440697903 +0000
committer android-build-merger <android-build-merger@google.com> 1440697903 +0000

am 6faee2f9: (-s ours) Update emulator binaries to fix arm64,mips64 boot
automerge: a568b8e

* commit 'a568b8e1ad4a37a31e5383183102ca904adf1900':