diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-12-13 16:03:09 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-12-13 16:03:09 +0000 |
| commit | 6ce095b8635ab72aa2508a3f99dbbb85ec4ca152 (patch) | |
| tree | c8f7cf00dab254946491c125573a83002191332b | |
| parent | 6a6311f8331f8cd2b3f86e012e552ec10e9b8d0b (diff) | |
| download | android_frameworks_webview-6ce095b8635ab72aa2508a3f99dbbb85ec4ca152.tar.gz android_frameworks_webview-6ce095b8635ab72aa2508a3f99dbbb85ec4ca152.tar.bz2 android_frameworks_webview-6ce095b8635ab72aa2508a3f99dbbb85ec4ca152.zip | |
Add third_party/angle to merged project list.
Chromium needs third_party/angle again.
Change-Id: I886614fe0bf538b69e0a4cbda58edc59de526c36
| -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 82306c6..e0bda24 100644 --- a/chromium/tools/merge_common.py +++ b/chromium/tools/merge_common.py @@ -36,6 +36,7 @@ THIRD_PARTY_PROJECTS_WITH_FLAT_HISTORY = [ THIRD_PARTY_PROJECTS_WITH_FULL_HISTORY = [ 'sdch/open-vcdiff', 'testing/gtest', + 'third_party/angle', 'third_party/angle_dx11', 'third_party/eyesfree/src/android/java/src/com/googlecode/eyesfree/braille', 'third_party/freetype', |