| commit | df9591a4dc58da5744dd7876acf112ef3f32e6eb | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Tue Apr 23 01:18:54 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 23 01:18:54 2019 -0700 |
| tree | d4c01e5a64fc3ca35fd781c2e686056c614f518c | |
| parent | 58d9ece0d3c9bffae9c13117fed43e6db784d861 [diff] | |
| parent | 91dab790e756228417caa8b405556cbb31626003 [diff] |
Merge "[KA11] Verify fd ownership and allocate resource for NattKeepalive" am: fb36d44462 am: 91dab790e7 Change-Id: I410acc19ceb13e32c65cbdf3095da9db0802470c