| commit | 8e27ca4d3bfd08ae87ac109b4d65858ac31e75a9 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Thu Sep 12 16:44:10 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 12 16:44:10 2013 -0700 |
| tree | 2edc2c71eb972a5bf7d6c01e6ee340b530838dd2 | |
| parent | 4547089af565343fe2f1afa18403419f78882472 [diff] | |
| parent | 0e50619ad29b270ea05d7ab3d7705b54b0876872 [diff] |
am 0e50619a: (-s ours) 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 '0e50619ad29b270ea05d7ab3d7705b54b0876872': Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.