tree 34913ac593f8fa520cbcf54e12119518aecf3163
parent 6c9f0a01602697aaed99f54c4db0d6296701ed43
parent 88eb0fa8eec7da1b7a3bd39f9d9844909911bc64
author Paul Jensen <pauljensen@google.com> 1412636486 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1412636487 +0000

Merge "Use network-specific HTTP proxy settings in captive portal login app." into lmp-dev