tree a161540071ff2a835f5ebc317456b013c5086546
parent a9b555cfa1cbbf600af7c6b5770cc9519662970f
parent 4e2e3f823b4f5b179ee331b45a94bd05d8b6ca87
author nharold <nharold@google.com> 1519168073 +0000
committer android-build-merger <android-build-merger@google.com> 1519168073 +0000

Merge "Fix ConnectivityServiceTest for NATT Keepalive" am: cab3e6009c
am: 4e2e3f823b

Change-Id: I3c28cbb55f8226776792df9cacf1b5e527389157