Commit 7cba6168 authored Sep 12, 2013 by Scott Main Committed by Android Git Automerger Sep 12, 2013

am 9a3fb871: Merge "Revert "remove renderscript support lib from javadocs" ......

am 9a3fb871: Merge "Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in." into jb-mr2-ub-dev

* commit '9a3fb871':
  Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.

parents 0c2b69d5 9a3fb871

core/pathmap.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -115,6 +115,7 @@ FRAMEWORKS_SUPPORT_SUBDIRS := \
		v7/gridlayout \
		v7/appcompat \
		v7/mediarouter \
		v8/renderscript \
		v13

		#