tree 3d10398501c62df49dd9340ba6c8781d97bf5d15
parent aa4d6f1be92b63db227c8505a437487edd06d600
parent f9f5cf9d9b60d850ef66dc10e242b766d13dec65
author Erik Kline <ek@google.com> 1484216803 +0000
committer android-build-merger <android-build-merger@google.com> 1484216803 +0000

Merge "Simplify UpstreamNetworkMonitor callback handling"
am: f9f5cf9d9b

Change-Id: I642567d81b6b8908b2ef7afea8d15628330481f9