am 427d1e98: Merge "Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE."

author Jeff Davidson <jpd@google.com>

Wed, 29 Oct 2014 17:40:05 +0000 (17:40 +0000)

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

Wed, 29 Oct 2014 17:40:05 +0000 (17:40 +0000)
author Jeff Davidson <jpd@google.com>
Wed, 29 Oct 2014 17:40:05 +0000 (17:40 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 29 Oct 2014 17:40:05 +0000 (17:40 +0000)
diff --cc core/binary.mk
Simple merge
diff --cc core/java.mk
Simple merge
author	Jeff Davidson <jpd@google.com>
	Wed, 29 Oct 2014 17:40:05 +0000 (17:40 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 29 Oct 2014 17:40:05 +0000 (17:40 +0000)
		1	2
core/binary.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/java.mk	patch \|	diff1 \|	diff2 \|	blob \| history