| commit | 0a177afbb88a6f3cbc401edbb6cd47282ff9e671 | [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 | be5452436195bc99880294c5dafb3b691924bd96 | |
| parent | 50450452cfc4240ac3728d4dbdd756f6403b6995 [diff] | |
| parent | ad96984eb5be6f986e5d3d492a507e4885094e3d [diff] |
Merge "Fix ConnectivityServiceTest for NATT Keepalive" am: 6d5aea8811 am: ad96984eb5 Change-Id: I3c28cbb55f8226776792df9cacf1b5e527389157