summaryrefslogtreecommitdiffstats
path: root/chromium/tools
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2013-06-10 18:09:17 +0100
committerBen Murdoch <benm@google.com>2013-06-10 18:09:17 +0100
commit2ad1105953c418b574ecffa8b002d41d0564e9d7 (patch)
treec87ed8bbc808ae6d684a9119849c33f64e8e5eb2 /chromium/tools
parentf59e61882976fad4c6841df6df68d5a50f64cbef (diff)
downloadandroid_frameworks_webview-2ad1105953c418b574ecffa8b002d41d0564e9d7.tar.gz
android_frameworks_webview-2ad1105953c418b574ecffa8b002d41d0564e9d7.tar.bz2
android_frameworks_webview-2ad1105953c418b574ecffa8b002d41d0564e9d7.zip
Add third_party/mesa/src to automerger project list.
Change-Id: I1c7d091c4fcc15ec2bb22a836e0132b954ab2943
Diffstat (limited to 'chromium/tools')
-rw-r--r--chromium/tools/merge_common.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/chromium/tools/merge_common.py b/chromium/tools/merge_common.py
index 21d23af..a31b677 100644
--- a/chromium/tools/merge_common.py
+++ b/chromium/tools/merge_common.py
@@ -45,6 +45,7 @@ THIRD_PARTY_PROJECTS_WITH_FULL_HISTORY = [
'third_party/libjingle/source',
'third_party/libphonenumber/src/phonenumbers',
'third_party/libphonenumber/src/resources',
+ 'third_party/mesa/src',
'third_party/openssl',
'third_party/opus/src',
'third_party/ots',