am 84882711: am 808723f2: Merge "Cleanup Allocation and add 3D copies." into jb-mr2-dev

author Jason Sams <jsams@google.com>

Wed, 10 Apr 2013 04:27:49 +0000 (21:27 -0700)

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

Wed, 10 Apr 2013 04:27:49 +0000 (21:27 -0700)
author Jason Sams <jsams@google.com>
Wed, 10 Apr 2013 04:27:49 +0000 (21:27 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 10 Apr 2013 04:27:49 +0000 (21:27 -0700)
diff --cc api/current.txt
Simple merge
diff --cc graphics/java/android/renderscript/RenderScript.java
Simple merge
author	Jason Sams <jsams@google.com>
	Wed, 10 Apr 2013 04:27:49 +0000 (21:27 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 10 Apr 2013 04:27:49 +0000 (21:27 -0700)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
graphics/java/android/renderscript/RenderScript.java	patch \|	diff1 \|	diff2 \|	blob \| history