diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 12:26:56 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 12:26:56 +0000 |
| commit | 571f91c0e55e987af1a3266766b68275a2275773 (patch) | |
| tree | 7ed7eb285d6433d9ba0ba8b5ae437af812344fe4 /build/ios | |
| parent | 538a486ce37c4935f1d2f83f9b40484328ab397d (diff) | |
| download | chromium_src-571f91c0e55e987af1a3266766b68275a2275773.zip chromium_src-571f91c0e55e987af1a3266766b68275a2275773.tar.gz chromium_src-571f91c0e55e987af1a3266766b68275a2275773.tar.bz2 | |
Revert "Add error message for domain mismatch on re-enrollment."
This reverts
https://src.chromium.org/viewvc/chrome?view=rev&revision=260102
It seems to have caused android build breakage:
http://build.chromium.org/p/chromium.linux/buildstatus?builder=Android%20Tests%20%28dbg%29&number=19481
BUG=chromium:357207
TEST=None
TBR=mnissler@chromium.org
NOTRY=true
NOTREECHECKS=true
Review URL: https://codereview.chromium.org/216923002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260110 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/ios')
| -rw-r--r-- | build/ios/grit_whitelist.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/build/ios/grit_whitelist.txt b/build/ios/grit_whitelist.txt index 666af97..6583829 100644 --- a/build/ios/grit_whitelist.txt +++ b/build/ios/grit_whitelist.txt @@ -700,7 +700,6 @@ IDS_POLICY_DM_STATUS_SERVICE_ACTIVATION_PENDING IDS_POLICY_DM_STATUS_SERVICE_DEPROVISIONED IDS_POLICY_DM_STATUS_SERVICE_DEVICE_ID_CONFLICT IDS_POLICY_DM_STATUS_SERVICE_DEVICE_NOT_FOUND -IDS_POLICY_DM_STATUS_SERVICE_DOMAIN_MISMATCH IDS_POLICY_DM_STATUS_SERVICE_INVALID_SERIAL_NUMBER IDS_POLICY_DM_STATUS_SERVICE_MANAGEMENT_NOT_SUPPORTED IDS_POLICY_DM_STATUS_SERVICE_MANAGEMENT_TOKEN_INVALID |