diff options
| author | Ricardo Cervera <rcervera@google.com> | 2014-10-17 18:51:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-17 18:51:23 +0000 |
| commit | c1c3132774a9a87e1a6dd625d6a284939652cc38 (patch) | |
| tree | 9eddbd3904197a9dd63bceb7eb1884fb46f36854 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b14e07e34428e64d9a9525ea0322aa161b05efe6 (diff) | |
| parent | f14250014b11fd61dec427dd0813fbb43d2fe3ff (diff) | |
am f1425001: am 2e57c2c9: Merge "docs: Migrating material design info from the Preview site" into lmp-dev
* commit 'f14250014b11fd61dec427dd0813fbb43d2fe3ff':
docs: Migrating material design info from the Preview site
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions