From: Griff Hazen <griff@google.com>
Date: Sun, 8 Nov 2015 01:06:15 +0000 (+0000)
Subject: Merge "Let qemu_props service set system properties in ro.emu and ro.emulator" am... 
X-Git-Tag: android-x86-7.1-r1~776
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=83c07e93c99729842b3c0484418aa1ef0b499c71;p=android-x86%2Fbuild.git

Merge "Let qemu_props service set system properties in ro.emu and ro.emulator" am: 0b4529239f am: 2e4314481e
am: 9707c5d724

* commit '9707c5d724d3b6db9cc54156ea099399c1b80f9d':
  Let qemu_props service set system properties in ro.emu and ro.emulator
---

83c07e93c99729842b3c0484418aa1ef0b499c71