tree 3abf15e862fddc6b8b7a2e683729f770c9351b54
parent f114e0f7fe860f36428139456810ab6dcdb05f09
parent b67f970cfec26d4f0d720f5bceac93ba82f74af7
author Steven Moreland <smoreland@google.com> 1488340704 +0000
committer android-build-merger <android-build-merger@google.com> 1488340704 +0000

Merge "lshal: separate timeout for hwservicemanager list" am: 180bb92608
am: b67f970cfe

Change-Id: I6f240558cf45aa840abea2aed5af5ec559f7b209