am 64606bd5: Merge "Update protobuf library from 2.3 to 2.6."

author Jeff Davidson <jpd@google.com>

Thu, 15 Jan 2015 23:01:59 +0000 (23:01 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Thu, 15 Jan 2015 23:01:59 +0000 (23:01 +0000)
author Jeff Davidson <jpd@google.com>
Thu, 15 Jan 2015 23:01:59 +0000 (23:01 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 15 Jan 2015 23:01:59 +0000 (23:01 +0000)
diff --cc core/binary.mk
Simple merge
diff --cc core/java.mk
Simple merge
author	Jeff Davidson <jpd@google.com>
	Thu, 15 Jan 2015 23:01:59 +0000 (23:01 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 15 Jan 2015 23:01:59 +0000 (23:01 +0000)
		1	2
core/binary.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/java.mk	patch \|	diff1 \|	diff2 \|	blob \| history