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)
am: b67f970cfe

Change-Id: I6f240558cf45aa840abea2aed5af5ec559f7b209


Trivial merge