| commit | 137c833e703b1cb9160bd85893d3112df3e905df | [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 | 21a3501037a47cc00455ad2293873165aa9c51a6 [diff] | |
| parent | 4f00de4aadc6307aaf5f2cc968c234580821275b [diff] |
Merge "Fix ConnectivityServiceTest for NATT Keepalive" am: f6bbc21688 am: 4f00de4aad Change-Id: I3c28cbb55f8226776792df9cacf1b5e527389157