tree dea934d3e5cc11608cc1a8c4e8d351f4137de99f
parent 8f6c3b4fb3e93db76c3c209d204d8bec918924e0
parent c5f5903cbd73cdd86d10f0256442e2b426ac5596
author David 'Digit' Turner <digit@google.com> 1403023974 +0200
committer David 'Digit' Turner <digit@google.com> 1403023974 +0200

resolve merge conflicts of c5f5903 to master.

Conflicts:
	android/main-emulator.c

Change-Id: Iffc6f5aaa95a1cdfcc81a26c43172e6c5ba8111a