tree 9d289caa2e38b652c26e91945fd2065231bc6409
parent 7256669a28229e5cbcf27f0175d1d55d4fa5b269
parent 46175db538416911ec6f97b736901d8a56ad247d
author Erik Kline <ek@google.com> 1487924691 +0000
committer android-build-merger <android-build-merger@google.com> 1487924691 +0000

Merge "Update UpstreamNetworkMonitor to use custom Handlers" am: 35c89886c2 am: 46175db538
am: c239511cdb

Change-Id: I9a210b4896810e7365b2403495716395b3866650