OSDN Git Service

Merge "Log upstream network suspend/resume callbacks" into oc-mr1-dev
authorErik Kline <ek@google.com>
Wed, 11 Oct 2017 01:43:00 +0000 (01:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Oct 2017 01:43:00 +0000 (01:43 +0000)
am: ab10e1a7db

Change-Id: I9121798bba0be9dcdf1e45d39c092020620fa53b


Trivial merge