Merge "Unhide USAGE_IO_INPUT functions" into klp-dev

author Jason Sams <jsams@google.com>

Thu, 29 Aug 2013 21:24:28 +0000 (21:24 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 29 Aug 2013 21:24:28 +0000 (21:24 +0000)
author Jason Sams <jsams@google.com>
Thu, 29 Aug 2013 21:24:28 +0000 (21:24 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 29 Aug 2013 21:24:28 +0000 (21:24 +0000)
diff --cc api/current.txt
Simple merge
diff --cc graphics/java/android/renderscript/Allocation.java
Simple merge
author	Jason Sams <jsams@google.com>
	Thu, 29 Aug 2013 21:24:28 +0000 (21:24 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 29 Aug 2013 21:24:28 +0000 (21:24 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
graphics/java/android/renderscript/Allocation.java	patch \|	diff1 \|	diff2 \|	blob \| history