am 50ef9040: am 2b942f87: Merge "Add build rules for libRSSupportIO (Usage_IO lib...

author Miao Wang <miaowang@google.com>

Fri, 16 Jan 2015 16:50:15 +0000 (16:50 +0000)

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

Fri, 16 Jan 2015 16:50:15 +0000 (16:50 +0000)
author Miao Wang <miaowang@google.com>
Fri, 16 Jan 2015 16:50:15 +0000 (16:50 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 16 Jan 2015 16:50:15 +0000 (16:50 +0000)
diff --cc core/config.mk
Simple merge
diff --cc core/java.mk
Simple merge
author	Miao Wang <miaowang@google.com>
	Fri, 16 Jan 2015 16:50:15 +0000 (16:50 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 16 Jan 2015 16:50:15 +0000 (16:50 +0000)
		1	2
core/config.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/java.mk	patch \|	diff1 \|	diff2 \|	blob \| history