| commit | 0e50619ad29b270ea05d7ab3d7705b54b0876872 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Thu Sep 12 12:19:36 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 12 12:19:36 2013 -0700 |
| tree | 963f2ea3778c247f1478d6e11b309ccb98ea711a | |
| parent | 5bffb360f095cb6db5ae539d1571ec1be9e8fd35 [diff] | |
| parent | 3938f3e1af045e887735884b059224a86f46db74 [diff] |
am 3938f3e1: 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 '3938f3e1af045e887735884b059224a86f46db74': Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.