tree 938a0e33ad020ce6a1e049dac321ef6381a347a0
parent 4c2b34797eb3ab1c97021799a21da45193663a14
parent b700891a3997c0d5515a3ac059331e2ba53cd031
author Chalard Jean <jchalard@google.com> 1540535526 -0700
committer android-build-merger <android-build-merger@google.com> 1540535526 -0700

Merge "ConnectivityService: make log configurable" am: e42fbe4606
am: b700891a39

Change-Id: I70557edd9750549d91f58f1ca1e841055c69fabc