tree 7d3e8582ae9809648b90ab29bf243d80428a7ae6
parent 1a958a57b82e569a9169c960ac399acd0bb5493f
parent 255cac2474e33139eddc48f9c294a5ccdb287fa4
author Jeff Sharkey <jsharkey@android.com> 1512437902 +0000
committer android-build-merger <android-build-merger@google.com> 1512437902 +0000

Merge "Match network roaming state to avoid wtf()." am: 3fb2711ede am: bafba08c6b
am: 255cac2474

Change-Id: I04247a01f6a93001079429b1ee40f28afc877dcd