tree c1c6eb060575649270847cc785473cb3e90082e9
parent 401ef259f3b2c8c87b02c9939c0599d6ad0f6f39
parent f779e6b8ac827d923e3e7905045ad5c35512c535
author Jeff Davidson <jpd@google.com> 1417831849 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417831849 +0000

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

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