| commit | 3a5a4efd8a9ee0a979d39c9cb61dd0ff1a6cea9c | [log] [tgz] |
|---|---|---|
| author | nharold <nharold@google.com> | Tue Feb 20 23:07:53 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Feb 20 23:07:53 2018 +0000 |
| tree | a161540071ff2a835f5ebc317456b013c5086546 | |
| parent | a9b555cfa1cbbf600af7c6b5770cc9519662970f [diff] | |
| parent | 4e2e3f823b4f5b179ee331b45a94bd05d8b6ca87 [diff] |
Merge "Fix ConnectivityServiceTest for NATT Keepalive" am: cab3e6009c am: 4e2e3f823b Change-Id: I3c28cbb55f8226776792df9cacf1b5e527389157