OSDN Git Service

Merge "configstore-utils: vendor_available" into oc-dev
authorJayant Chowdhary <jchowdhary@google.com>
Wed, 31 May 2017 04:14:07 +0000 (04:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 31 May 2017 04:14:07 +0000 (04:14 +0000)
am: 3dca679b80  -s ours

Change-Id: Ic88ab64c96a097bbaa032f4ac6ce82cfc2c669db


Trivial merge