tree 1c89531f8c414eb39be51816fee62be3c17da916
parent a2ba2a3923f4b247ad516c28a7f3449f9abfd21c
parent c239511cdbb472e33568e8b635bc968f2a7c6c72
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: 279a4feb72
am: c239511cdb

Change-Id: I9a210b4896810e7365b2403495716395b3866650