OSDN Git Service

Merge "lshal: separate timeout for hwservicemanager list" am: 180bb92608
authorSteven Moreland <smoreland@google.com>
Wed, 1 Mar 2017 03:58:24 +0000 (03:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 1 Mar 2017 03:58:24 +0000 (03:58 +0000)
commitcf148e1e08628d604d4cbc78dbcd22d4cbb34325
tree3abf15e862fddc6b8b7a2e683729f770c9351b54
parentf114e0f7fe860f36428139456810ab6dcdb05f09
parentb67f970cfec26d4f0d720f5bceac93ba82f74af7
Merge "lshal: separate timeout for hwservicemanager list" am: 180bb92608
am: b67f970cfe

Change-Id: I6f240558cf45aa840abea2aed5af5ec559f7b209