| commit | 2b1592206bc476ab05f8cec7d3609d99b9284d81 | [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 | 0bf8c2522a9af666847c3292dcffe446d3734704 [diff] | |
| parent | 3a5a4efd8a9ee0a979d39c9cb61dd0ff1a6cea9c [diff] |
Merge "Fix ConnectivityServiceTest for NATT Keepalive" am: cab3e6009c am: 4e2e3f823b am: 3a5a4efd8a Change-Id: I2ce9d740b82f591b847150ec1eaffa39bfbd0241