tree b5812dcc85f96c624b304f156595d1d60a4a44b5
parent d6125b5e2ff71988009bc0fd86a32876e9a6981f
parent 27597c4d8ee7623152bf908b05eed6b869987c14
author Scott Main <smain@google.com> 1379013259 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1379013259 +0000

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