OSDN Git Service

Merge "Fix event listener timeout issues" into oc-dev
authorJeff Tinker <jtinker@google.com>
Mon, 10 Apr 2017 18:23:48 +0000 (18:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 10 Apr 2017 18:23:48 +0000 (18:23 +0000)
am: 61fd056380

Change-Id: I737521de9c183b763f87d5e84da569a197e0a370


Trivial merge