tree 56f3b7ed8a4a4859bb196ea21e39b900fe36ef0c
parent 5d0bf5de0d334db6cbfb7d32fd3a5d31b2f7deee
parent 0efd29fc57c7369e2371aa3226e90f97331f517a
author Jeff Davidson <jpd@google.com> 1418086834 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418086834 +0000

am 0efd29fc: am 386effc7: am f779e6b8: Merge "Fix flipped captive portal bit in network conditions bcast." into lmp-mr1-dev

* commit '0efd29fc57c7369e2371aa3226e90f97331f517a':
  Fix flipped captive portal bit in network conditions bcast.