aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-11-22 10:35:14 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2013-11-22 10:35:14 -0800
commitc4c4a562672068fb89ea4e65408dd53de2ed8f1f (patch)
treee3f439f20eb72d01d921f98079d7710fcc0c88ad
parentf5271c9ca4a237221c0ba722dc548050ad131064 (diff)
parent7cb6b37f3799affce9e1be39977d4419283df795 (diff)
downloadexternal_protobuf-c4c4a562672068fb89ea4e65408dd53de2ed8f1f.zip
external_protobuf-c4c4a562672068fb89ea4e65408dd53de2ed8f1f.tar.gz
external_protobuf-c4c4a562672068fb89ea4e65408dd53de2ed8f1f.tar.bz2
Merge commit '7cb6b37f3799affce9e1be39977d4419283df795' into HEAD
-rw-r--r--build.gradle1
1 files changed, 1 insertions, 0 deletions
diff --git a/build.gradle b/build.gradle
index 832a924..1efd4bf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,4 @@
+=======
/*
* Copyright (C) 2013 The Android Open Source Project
*