tree 1602a69f89e95005465f095c11b6fa2e97fd460a
parent ad0d879e52907f3d38c89e89e518dec2cb9033f9
parent 5c9546b1dabd36ad8358705ac617ea3c606d5317
author Lorenzo Colitti <lorenzo@google.com> 1422018326 +0000
committer android-build-merger <android-build-merger@google.com> 1422018326 +0000

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

* commit '5c9546b1dabd36ad8358705ac617ea3c606d5317':
  Support connecting to networks with misconfigured subnet masks.