Merge "Update for hidl adapter module defaults."
authorSteven Moreland <smoreland@google.com>
Wed, 4 Oct 2017 21:45:09 +0000 (21:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 4 Oct 2017 21:45:09 +0000 (21:45 +0000)
am: 988c977079

Change-Id: I289818be1b30397391847ba1c532d1014fdbed27


Trivial merge