commit | 3938f3e1af045e887735884b059224a86f46db74 | [log] [tgz] |
---|---|---|
author | Scott Main <smain@google.com> | Thu Sep 12 12:17:26 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 12 12:17:26 2013 -0700 |
tree | 2d2abd1a920f13b67d7bf3d447fc4cb9a4c04ed8 | |
parent | 5839c0f23deb80cce3314172d23ba5926262aef4 [diff] | |
parent | 7cba6168c3cf7681e6200f78bfbf8deacc2f735c [diff] |
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.