| commit | 8974c107ae1e1234a3ff7fe4eb7b172d9b6cf8bb | [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 | 043061cf3087d92c6ec78cbad3ef54b91549bb76 | |
| parent | 856f0a7d85669de947adbbb2ddd0849f9cc60559 [diff] | |
| parent | 137c833e703b1cb9160bd85893d3112df3e905df [diff] |
Merge "Fix ConnectivityServiceTest for NATT Keepalive" am: f6bbc21688 am: 4f00de4aad am: 137c833e70 Change-Id: I2ce9d740b82f591b847150ec1eaffa39bfbd0241