OSDN Git Service

Merge "Support for multiple instances" am: e97dfde326
authorYabin Cui <yabinc@google.com>
Tue, 15 Nov 2016 02:20:26 +0000 (02:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 15 Nov 2016 02:20:26 +0000 (02:20 +0000)
am: 438487eb3c

Change-Id: I4df6c57fa1d4863b26a10d10cbf8c6be107a07f9


Trivial merge