OSDN Git Service

Merge changes from topic 'vts-validate-policy-conf' into oc-dev
authorKevin Rocard <krocard@google.com>
Tue, 6 Jun 2017 04:52:40 +0000 (04:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Jun 2017 04:52:40 +0000 (04:52 +0000)
am: 024e0cd27d  -s ours

Change-Id: If42bf61dbaac6796b46cc1cc80c138003cb093c6


Trivial merge