tree 8263f6b7d2cea24866fc27c9b0607cfc3ae6cb38
parent a40ecc7218af32e3feba6e432cedb4d7b0cca483
parent 8d3efa6722cc4f98a8aebe1b6903915ac10e2da8
author Erik Kline <ek@google.com> 1507686789 +0000
committer android-build-merger <android-build-merger@google.com> 1507686789 +0000

Merge "Log upstream network suspend/resume callbacks" into oc-mr1-dev am: ab10e1a7db
am: 8d3efa6722

Change-Id: I1d3420380691efd886315275598134b98f4041ed