commit | c4c9df3d7137206dcc9d6028e29a29e0a1d781ee | [log] [tgz] |
---|---|---|
author | Oscar Montemayor <oam@google.com> | Wed Aug 04 16:25:01 2010 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Aug 04 16:25:01 2010 -0700 |
tree | 9eb1d33ffe5674e425067689c646f25e15cbc408 | |
parent | 8525f5dc4a776e4dbf03696ad39beb6345a5ef6f [diff] | |
parent | 69238c6a37ae43c748ad9cd7613f2209149ee7da [diff] |
Merge "Device Policy Manager changes to enable Global Proxy."