am 904446ce: am 1a3d260f: am e69d4350: Merge "Support to add JNI of both archs in...

author Ying Wang <wangying@google.com>

Wed, 25 Jun 2014 18:52:02 +0000 (18:52 +0000)

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

Wed, 25 Jun 2014 18:52:02 +0000 (18:52 +0000)
author Ying Wang <wangying@google.com>
Wed, 25 Jun 2014 18:52:02 +0000 (18:52 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 25 Jun 2014 18:52:02 +0000 (18:52 +0000)
diff --cc core/clear_vars.mk
Simple merge
diff --cc core/definitions.mk
Simple merge
diff --cc core/package_internal.mk
Simple merge
diff --cc core/prebuilt_internal.mk
Simple merge
author	Ying Wang <wangying@google.com>
	Wed, 25 Jun 2014 18:52:02 +0000 (18:52 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 25 Jun 2014 18:52:02 +0000 (18:52 +0000)
		1	2
core/clear_vars.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/package_internal.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/prebuilt_internal.mk	patch \|	diff1 \|	diff2 \|	blob \| history