tree 1f5ac01b7b2f5ded5ef4e130da6048b27ccc8cd6
parent 221e58fe9561c5f942c029d7ad6466a1a6dc4bc0
parent 46f8abd229dd9b9b795c3e5b30286a530f43fd3d
author Erik Kline <ek@google.com> 1485544819 +0000
committer android-build-merger <android-build-merger@google.com> 1485544819 +0000

Merge "Switch to listening for all network changes." am: 085ffa76fa
am: 46f8abd229

Change-Id: I28ad47a86ea534c5b675a530ffbaac415fd60b25