Merge pull request #2424 from sigmabeta/android-emulation-activity Android: Implement new EmulationActivity.
