OSDN Git Service

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

Change-Id: I770e5dd74698ef5dc10158e2664ac9fd847db813


Trivial merge