diff options
| author | Ricardo Cervera-Navarro <rcervera@google.com> | 2014-04-18 19:08:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-18 19:08:05 +0000 |
| commit | 4874938ad3fb0d0ab56b24cb18c8943a72559f12 (patch) | |
| tree | 71c0156e633fa0f534f038964d1f567f8a35d95c /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | ed5b8c06bbc70facbe553a9ca257a277ac3758ca (diff) | |
| parent | 84e6bc61c64aa578aed50460f7e4f16d85f81cbb (diff) | |
am 84e6bc61: Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs
* commit '84e6bc61c64aa578aed50460f7e4f16d85f81cbb':
Revert "docs: Watermark images with easter eggs"
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions