tree 48a2345e881d16016e1a7d5a7276475ee11a490c
parent 2c4125be4289bd44451480ddc93616a15b3fcd2a
parent 81ab2106c4a6f2d8f59b1fc5e383857855ff6668
author Lorenzo Colitti <lorenzo@google.com> 1446022279 +0000
committer android-build-merger <android-build-merger@google.com> 1446022279 +0000

Merge "Set accept_ra to 2 on all interfaces." am: 4ea2a41464
am: 81ab2106c4

* commit '81ab2106c4a6f2d8f59b1fc5e383857855ff6668':
  Set accept_ra to 2 on all interfaces.