OSDN Git Service

Merge "Add event monitoring to Inferno." am: 945911cbae am: 878c04ed7d
authorFabien Sanglard <sanglardf@google.com>
Mon, 17 Jul 2017 18:48:02 +0000 (18:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 17 Jul 2017 18:48:02 +0000 (18:48 +0000)
am: d9a9139b54

Change-Id: I7667a49e426cd64070a5d9685453025888671fcc


Trivial merge