summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2013-09-12 12:16:02 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-12 12:16:02 -0700
commit7cba6168c3cf7681e6200f78bfbf8deacc2f735c (patch)
treef2526eabd954b223fd0a6285428fb0f2871e749a /core
parent0c2b69d5b82062ecdef39297ddc7f7d86d038ad8 (diff)
parent9a3fb8711f93751ba3e709f4e99691147e6c2c93 (diff)
downloadbuild-7cba6168c3cf7681e6200f78bfbf8deacc2f735c.zip
build-7cba6168c3cf7681e6200f78bfbf8deacc2f735c.tar.gz
build-7cba6168c3cf7681e6200f78bfbf8deacc2f735c.tar.bz2
am 9a3fb871: Merge "Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in." into jb-mr2-ub-dev
* commit '9a3fb8711f93751ba3e709f4e99691147e6c2c93': Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
Diffstat (limited to 'core')
-rw-r--r--core/pathmap.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/pathmap.mk b/core/pathmap.mk
index 7024e3e..09f912e 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -115,6 +115,7 @@ FRAMEWORKS_SUPPORT_SUBDIRS := \
v7/gridlayout \
v7/appcompat \
v7/mediarouter \
+ v8/renderscript \
v13
#