| commit | 082263344a554e409c9376c6a6101db2b0cccba4 | [log] [tgz] |
|---|---|---|
| author | Erik Kline <ek@google.com> | Thu Jan 12 10:33:24 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jan 12 10:33:24 2017 +0000 |
| tree | a50b6c8480b3a8a9b234ad26d06136487d31029b | |
| parent | eed50c18097bfef02b8e2e40ed7db99035cae8bf [diff] | |
| parent | cbd3d8b3568cd21af3c5800a6e5442a4f0763f98 [diff] |
Merge "Simplify UpstreamNetworkMonitor callback handling" am: f9f5cf9d9b am: cbd3d8b356 Change-Id: I845443ae243429847e0a42b3be5bec6276a216c0