tree db42057aca74e83fa57c202b414fd5e3c8879e7b
parent 2b6a9e2213d61dd7c5faa2a74796f2f8b792226f
parent 4be51a8512c2fb72e57326ee5d9f5f1d06eee3a2
author Steven Moreland <smoreland@google.com> 1494464146 +0000
committer android-build-merger <android-build-merger@google.com> 1494464146 +0000

Merge changes from topic 'fix-hidl-generate' into oc-dev
am: 4be51a8512  -s ours

Change-Id: I91054a4a0ffcf6ff117bd4b6c3dcc3a94e7231c2