am 814d1938: am b1df2577: (-s ours) resolved conflicts for merge of ab10e256 to mnc-dev-plus-aosp

* commit '814d1938f091d311c709bc714c2d31032d43d7bc':
diff --git a/README.version b/README.version
index ff065ab..8d84679 100644
--- a/README.version
+++ b/README.version
@@ -1,3 +1,3 @@
-https://sourceforge.net/projects/giflib/files/giflib-5.1.1.tar.bz2/download
+URL: https://sourceforge.net/projects/giflib/files/giflib-5.1.1.tar.bz2/download
 Version: 5.1.1
 BugComponent: 24950