summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Austin <baustin@google.com>2014-11-26 13:39:25 -0800
committerBrent Austin <baustin@google.com>2014-11-26 13:39:25 -0800
commit670f1cb43c6b9b046df76bb4fe562abadb465bde (patch)
treea4f7d634f383826ff58aae687f868122622a4085
parent7a7f83a9bc265deb8943ff61f45ee6e47c2208a2 (diff)
downloadmanifest-670f1cb43c6b9b046df76bb4fe562abadb465bde.tar.gz
Point external/protobuf back to master.
The pre-compiled libraries are not in lollipop-release. I'm working on compiling the libraries from source so this can eventually switch back to lollipop-release. In the meantime, we need the master branch to fix the gfxspy build.
-rw-r--r--default.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/default.xml b/default.xml
index 6045cbeef..f78e774c8 100644
--- a/default.xml
+++ b/default.xml
@@ -21,7 +21,7 @@
<project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" revision="master" />
<project path="external/gtest" name="platform/external/gtest" revision="master" />
<project path="external/emma" name="platform/external/emma" revision="master"/>
- <project path="external/protobuf" name="platform/external/protobuf" revision="lollipop-release" />
+ <project path="external/protobuf" name="platform/external/protobuf" revision="master" />
<project path="external/qemu" name="platform/external/qemu" />
<project path="frameworks/native" name="platform/frameworks/native" revision="lollipop-release" />
<project path="prebuilts/android-emulator" name="platform/prebuilts/android-emulator" />