tree a29ddd61c623cc4d2accaa92903a0368d802b671
parent c097f7b8867a95c97bf2a8c231bc06ca179a0138
parent cbab402a94995b46560c1226cdc865108d89a3ad
author Yifan Hong <elsk@google.com> 1490747927 +0000
committer android-build-merger <android-build-merger@google.com> 1490747927 +0000

Merge changes from topic 'hidl_gen_fix'
am: cbab402a94

Change-Id: Ib6f643b95701bb349b2a5dcce7b4ed8717b09ba8