| commit | e7e42ceb028c49b626e2cee591a967c7a16fb830 | [log] [tgz] |
|---|---|---|
| author | nharold <nharold@google.com> | Tue Feb 20 23:21:59 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Feb 20 23:21:59 2018 +0000 |
| tree | ec730be5dae3608dbe2ccae21e4d70711315c86f | |
| parent | b729375d47c72fef61d195857ba7086f2941dc20 [diff] | |
| parent | 0a177afbb88a6f3cbc401edbb6cd47282ff9e671 [diff] |
Merge "Fix ConnectivityServiceTest for NATT Keepalive" am: 6d5aea8811 am: ad96984eb5 am: 0a177afbb8 Change-Id: I2ce9d740b82f591b847150ec1eaffa39bfbd0241