| commit | f10606a9a4193cb5ba56dd26db9983845855e8c3 | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Fri Jun 06 20:50:23 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jun 06 20:50:23 2014 +0000 |
| tree | ca81fec00fd3a29866bbe46f286bbaf633387832 | |
| parent | bb1b857841ad10674930f3b88499cd1fe7cc9f24 [diff] | |
| parent | 03bc9918345a977e9c45796bf3bb5bf9a3b87d25 [diff] |
Merge "Add device-owner based setting of global proxy."