OSDN Git Service

Merge "Avoid exposing OffloadCallbackEvent values" into oc-dr1-dev
authorErik Kline <ek@google.com>
Wed, 12 Jul 2017 15:32:58 +0000 (15:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Jul 2017 15:32:58 +0000 (15:32 +0000)
am: fcceb3ada4

Change-Id: Ie91b974fbf70a4242f8b220d5fa3d6a0de59201d


Trivial merge