OSDN Git Service

Merge "lshal: Fix timeout causes unexpected exits." am: 057e74631b am: fdf61aa557
authorYifan Hong <elsk@google.com>
Wed, 22 Feb 2017 18:43:43 +0000 (18:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Feb 2017 18:43:43 +0000 (18:43 +0000)
am: 91a4bd9cd2

Change-Id: I4663a64806ddb285e8bf5e9235759fee49bc8a93


Trivial merge