diff options
author | Dirk Dougherty <ddougherty@google.com> | 2013-01-16 16:39:17 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-16 16:39:17 -0800 |
commit | ce15192c72a3491f632d8cee89f2f58da1e4e0b6 (patch) | |
tree | 009cb3eccefd1452d0332ed4d7be93d3531331dd /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | ee6f89ff9cf08f78af84428102b910dd1275ef2d (diff) | |
parent | 4a0f95cffbb9925e95c216aea41f3450885d4061 (diff) |
am 4a0f95cf: am 3987f6c1: Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev
* commit '4a0f95cffbb9925e95c216aea41f3450885d4061':
Doc change: Fix urls to work properly with https.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions