commit | 3cecaaacbcfa320ee69ec83437bf5adc81e54aac | [log] [tgz] |
---|---|---|
author | Lorenzo Colitti <lorenzo@google.com> | Fri Jan 20 09:06:55 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jan 20 09:06:55 2017 +0000 |
tree | 6bcf4a4f2d54f17f51eb1e3e0f07c23897c16ea0 | |
parent | 3074c5ade869dde5b65676bccdfe0f2a3769f013 [diff] | |
parent | f73df6370a494f2669f8c385501d2779c684a301 [diff] |
Merge "Don't loop forever on zero-length ICMPv6 ND options." am: e7128b10a8 am: 113d5f8f40 am: 6bcbb16630 am: f73df6370a Change-Id: I4ca872c2e38f9513d0f5cb883a535f96a77afc76