tree 44c63cefddaabb681f5e2a61ced9ae07cc6f0db4
parent c2d51280395749328b0bb7a283cbc6037606822e
parent 50f9d93a1c6f3d9f28966dd61997b4b780f31fb2
author Lorenzo Colitti <lorenzo@google.com> 1422018102 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422018102 +0000

am 50f9d93a: am ae38596b: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev

* commit '50f9d93a1c6f3d9f28966dd61997b4b780f31fb2':
  Support connecting to networks with misconfigured subnet masks.