tree 8389ad8c447046b3f973283d3de588cae3712100
parent 3e15d09ed478bae413616463c1beec5c34a062a0
parent 8527f132519ade0f2e9d8181f688915a9cb7fefd
author Steven Moreland <smoreland@google.com> 1478125708 +0000
committer android-build-merger <android-build-merger@google.com> 1478125708 +0000

Merge "Update for hidlized hwservicemanager." am: 8d0c4ed74c
am: 8527f13251

Change-Id: I23ad38482ce6b7aa9857dccd6398af26b46ee46f