tree 2d233df5b6a6ab5c40f1613543e17d0d89298b58
parent dcb8cf8732768c13422b1eb172f18f80881148f8
parent 645cd2ad2665f422f0499d86b061d56a31926d18
author Erik Kline <ek@google.com> 1507694935 +0000
committer android-build-merger <android-build-merger@google.com> 1507694935 +0000

Merge "Log upstream network suspend/resume callbacks"
am: 645cd2ad26

Change-Id: I375e47a21d2fc6a5e67ff6367087c22beceb6377