Merge server-side changes of the cloud policy protocol

BUG=none
TEST=Chrome still compiles

Review URL: http://codereview.chromium.org/6880031

git-svn-id: http://src.chromium.org/svn/trunk/src/chrome/browser/policy/proto@82158 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
1 file changed