diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2014-10-17 18:52:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-17 18:52:57 +0000 |
| commit | 20a7afd4b4fb0bc38ea3d4920f62e337c1011219 (patch) | |
| tree | 42b4b0593544220aa7b8ea24853372fd9370ea01 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 84b4ad4b20c8e9f2caab05df6716590c84dde595 (diff) | |
| parent | f0c1af8e4b00a973914a1a3fe22f6d0f98fb704f (diff) | |
am f0c1af8e: am 22fa76da: Merge "Doc change: Add Lollipop to platform versions table." into lmp-dev
* commit 'f0c1af8e4b00a973914a1a3fe22f6d0f98fb704f':
Doc change: Add Lollipop to platform versions table.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions