tree ca81fec00fd3a29866bbe46f286bbaf633387832
parent bb1b857841ad10674930f3b88499cd1fe7cc9f24
parent 03bc9918345a977e9c45796bf3bb5bf9a3b87d25
author Jason Monk <jmonk@google.com> 1402087823 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1402087823 +0000

Merge "Add device-owner based setting of global proxy."