diff options
| author | Bo Liu <boliu@google.com> | 2013-12-16 22:39:30 -0800 |
|---|---|---|
| committer | Bo Liu <boliu@google.com> | 2013-12-16 22:39:30 -0800 |
| commit | 4aab98dbcc33a94cc58b884ecc623e56d6b0e03a (patch) | |
| tree | 335822019a0f82bc9431efc7a4fe6fff3048ab2d | |
| parent | d1d110d8139cf8347ed7c30b1ac78829ce861f32 (diff) | |
| download | android_frameworks_webview-4aab98dbcc33a94cc58b884ecc623e56d6b0e03a.tar.gz android_frameworks_webview-4aab98dbcc33a94cc58b884ecc623e56d6b0e03a.tar.bz2 android_frameworks_webview-4aab98dbcc33a94cc58b884ecc623e56d6b0e03a.zip | |
Do not merge third_party/angle_dx11
This is no longer needed and replaced by third_party/angle.
Change-Id: I19c8303745dd0211e96416fe77c3c4f0a3f0e2cc
| -rw-r--r-- | chromium/tools/merge_common.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/chromium/tools/merge_common.py b/chromium/tools/merge_common.py index e0bda24..c38df88 100644 --- a/chromium/tools/merge_common.py +++ b/chromium/tools/merge_common.py @@ -37,7 +37,6 @@ 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', 'third_party/icu', |