diff options
author | Dirk Dougherty <ddougherty@google.com> | 2013-01-17 11:55:49 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-17 11:55:49 -0800 |
commit | d275891a8aceab307746befcc0be08f4a73e99c2 (patch) | |
tree | 43f13abcf415ca2e2a97faaf7ba4aeba1a87e95b /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | ba1992f8e9e50ca58f007ff528d2f6d2c2b18223 (diff) | |
parent | ce15192c72a3491f632d8cee89f2f58da1e4e0b6 (diff) |
am ce15192c: am 4a0f95cf: am 3987f6c1: Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev
* commit 'ce15192c72a3491f632d8cee89f2f58da1e4e0b6':
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