diff options
author | Scott Main <smain@google.com> | 2013-09-12 12:17:26 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-12 12:17:26 -0700 |
commit | 3938f3e1af045e887735884b059224a86f46db74 (patch) | |
tree | 2d2abd1a920f13b67d7bf3d447fc4cb9a4c04ed8 /core | |
parent | 5839c0f23deb80cce3314172d23ba5926262aef4 (diff) | |
parent | 7cba6168c3cf7681e6200f78bfbf8deacc2f735c (diff) | |
download | build-3938f3e1af045e887735884b059224a86f46db74.zip build-3938f3e1af045e887735884b059224a86f46db74.tar.gz build-3938f3e1af045e887735884b059224a86f46db74.tar.bz2 |
am 7cba6168: am 9a3fb871: Merge "Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in." into jb-mr2-ub-dev
* commit '7cba6168c3cf7681e6200f78bfbf8deacc2f735c':
Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
Diffstat (limited to 'core')
-rw-r--r-- | core/pathmap.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/pathmap.mk b/core/pathmap.mk index 0292a30..5dfc543 100644 --- a/core/pathmap.mk +++ b/core/pathmap.mk @@ -109,6 +109,7 @@ FRAMEWORKS_SUPPORT_SUBDIRS := \ v7/gridlayout \ v7/appcompat \ v7/mediarouter \ + v8/renderscript \ v13 # |