OSDN Git Service

Merge "Support registration of offload control callbacks."
authorErik Kline <ek@google.com>
Fri, 26 May 2017 10:16:26 +0000 (10:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 May 2017 10:16:26 +0000 (10:16 +0000)
am: 7ee96625c2

Change-Id: Ica4f51762b577e3868e87622df3963cd89daacae


Trivial merge