diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-07-30 09:44:51 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-07-30 09:44:51 +0000 |
| commit | a20a107b5f4470d7fe1a483a493729220e8ba216 (patch) | |
| tree | 389a8927ed270d441f7e1ed054a0c2c410b77226 /chromium/tools | |
| parent | 9f110615014e3a578fab6b60c2f24e16e5a8866a (diff) | |
| download | android_frameworks_webview-a20a107b5f4470d7fe1a483a493729220e8ba216.tar.gz android_frameworks_webview-a20a107b5f4470d7fe1a483a493729220e8ba216.tar.bz2 android_frameworks_webview-a20a107b5f4470d7fe1a483a493729220e8ba216.zip | |
Revert "Fix Automerger"
This reverts commit 9f110615014e3a578fab6b60c2f24e16e5a8866a.
Change-Id: I7d15a4c31fa80af0ecab80bd270a15d63b51258d
Diffstat (limited to 'chromium/tools')
| -rw-r--r-- | chromium/tools/merge_common.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chromium/tools/merge_common.py b/chromium/tools/merge_common.py index 46ece78..52f4ee8 100644 --- a/chromium/tools/merge_common.py +++ b/chromium/tools/merge_common.py @@ -42,6 +42,7 @@ THIRD_PARTY_PROJECTS_WITH_FULL_HISTORY = [ 'third_party/freetype', 'third_party/icu', 'third_party/leveldatabase/src', + 'third_party/libjingle/source', 'third_party/libphonenumber/src/phonenumbers', 'third_party/libphonenumber/src/resources', 'third_party/mesa/src', |