From: Yabin Cui <yabinc@google.com>
Date: Tue, 15 Nov 2016 02:01:42 +0000 (+0000)
Subject: Merge "Support for multiple instances"
X-Git-Tag: android-x86-8.1-r1~68^2~13^2^2~49^2~21
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e97dfde3264c300bd9aa2b08c420384156f43f1c;p=android-x86%2Fsystem-extras.git

Merge "Support for multiple instances"
---

e97dfde3264c300bd9aa2b08c420384156f43f1c