tree 0c52825712c820f774cf68e505fe5589016946ba
parent 48ce8fc0f66111b1250e1ebb276125c5cb6aa8f4
parent 25c610798e44c4454076ea4e142d27322eafc696
author Dan Cashman <dcashman@google.com> 1492701932 +0000
committer android-build-merger <android-build-merger@google.com> 1492701932 +0000

Merge "Reflect removal of vndservice_manager object classes." into oc-dev am: 59ab9291cd
am: 25c610798e  -s ours

Change-Id: I9b78e325684d7504f0c1ec6b06f42cf66bbe3f14