commit b2df76ea8fec9e32f6f3718986dba0d95315b29c
author Torne (Richard Coles) <torne@google.com> Mon May 13 16:52:09 2013 +0100
committer Torne (Richard Coles) <torne@google.com> Mon May 13 16:52:09 2013 +0100
tree 0182623e854b794f7307829abf4be16435a0193a
parent 121d6d4bf5931d9b1dbc0b9a262f6c609440f6c7

Merge from Chromium at DEPS revision r199464

This commit was generated by merge_to_master.py.

Change-Id: Ic3d1f97a4fb4edd1e6ed66a70b5040da1622b5a9

WATCHLISTS

diff --git a/WATCHLISTS b/WATCHLISTS
index 2a42522..1b3fc20 100644
--- a/WATCHLISTS
+++ b/WATCHLISTS
@@ -286,9 +286,6 @@
     'linux_seccomp_bpf': {
       'filepath': 'content/common/sandbox.*linux.cc',
     },
-    'locale_settings': {
-      'filepath': 'chrome/app/resources/locale_settings',
-    },
     'managed_users': {
       'filepath': 'chrome/browser/managed_mode'\
                   '|chrome/browser/extensions/api/managed_mode'\
@@ -536,7 +533,7 @@
                       'yuzo+watch@chromium.org'],
     'android_infra': ['bulach+watch@chromium.org',
                       'yfriedman+watch@chromium.org',
-                      'ilevy+watch@chromium.org',
+                      'ilevy-cc@chromium.org',
                       'klundberg+watch@chromium.org',
                       'craigdh+watch@chromium.org',
                       'frankf+watch@chromium.org'],
@@ -624,7 +621,6 @@
     'linux_fonts': ['derat+watch@chromium.org'],
     'linux_sandboxing': ['agl@chromium.org', 'jln+watch@chromium.org'],
     'linux_seccomp_bpf': ['jln+watch@chromium.org'],
-    'locale_settings': ['finnur+watch@chromium.org'],
     'mac': ['sail+watch@chromium.org'],
     'managed_users': ['pam+watch@chromium.org'],
     'media': ['feature-media-reviews@chromium.org'],