tree 66c7e5cd5f335edc110a5193f44825efebdb4fc2
parent 0a64c3711ad277748a0ac52dc55e3f051e96133d
parent 626e9681f2bf9af9c441dd1cbaac075f0d5c0010
author Chalard Jean <jchalard@google.com> 1516866104 +0000
committer android-build-merger <android-build-merger@google.com> 1516866104 +0000

Merge "Fix a bug where a NetworkAgent gets repeatedly torn down" am: 20028ab529
am: 626e9681f2

Change-Id: Ifd63fdf47348dc3a1c1871deacc61470784bdbb6