summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-06-13 18:06:01 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2012-06-13 18:06:56 -0700
commit00664425fed08cecc88d6ec9b1715543f8219fca (patch)
treeca9b72ae823a23ecbfa168f36b9327f7dfeb5ba5
parent09c6c5aed4db7c29096b158eaf749010a1a0e22e (diff)
parentb5a0d13b2f49a9fb5e2ae619331c5e6f17c8f46e (diff)
downloadmanifest-00664425fed08cecc88d6ec9b1715543f8219fca.tar.gz
Merge from master
-rw-r--r--default.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/default.xml b/default.xml
index e3a9ce304..553678e17 100644
--- a/default.xml
+++ b/default.xml
@@ -54,6 +54,7 @@
<project path="external/bzip2" name="platform/external/bzip2" />
<project path="external/checkpolicy" name="platform/external/checkpolicy" />
<project path="external/chromium" name="platform/external/chromium" />
+ <project path="external/chromium-trace" name="platform/external/chromium-trace" revision="tools_r20" />
<project path="external/clang" name="platform/external/clang" />
<project path="external/collada" name="platform/external/collada" />
<project path="external/dbus" name="platform/external/dbus" />