OSDN Git Service

Merge changes from topic 'fix-hidl-generate' into oc-dev am: 4be51a8512 -s ours
authorSteven Moreland <smoreland@google.com>
Thu, 11 May 2017 01:46:22 +0000 (01:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 11 May 2017 01:46:22 +0000 (01:46 +0000)
am: da36690e9b  -s ours

Change-Id: I2a0776d045cca8967c29643b4d3b4507f88384a9


Trivial merge