tree 194254bda03ef492b418bca8dbceffd5f8cfb449
parent 16bc252940f278cb0607acfebafc21d9837a7f03
parent 0431000d467f23d474df26391ab3d0302eaca496
author Steven Moreland <smoreland@google.com> 1515172976 +0000
committer android-build-merger <android-build-merger@google.com> 1515172976 +0000

Merge "Allow hidl adapters to be stopped with a property."
am: 0431000d46

Change-Id: I50c9fde8a88d7e5310546ba5f092e3fcc7fcf96c