diff options
| author | Christopher Tate <ctate@google.com> | 2013-11-13 12:20:08 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-13 12:20:08 -0800 |
| commit | a46c7f32d3a19b3ce46c1dec2fee29982dee86b0 (patch) | |
| tree | 3035fee69afe05cb4dfe52970ed61d041515777d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | bd8492b5643b36040d35d1ffeef37ac3cd0b4da5 (diff) | |
| parent | 87b84ca6fc5070f2fbbb5f6d94863680b33d188b (diff) | |
am 87b84ca6: am e995ad15: am 0b2c2b10: Merge "Support preferred activities with zero or one scheme in the filter" into klp-dev
* commit '87b84ca6fc5070f2fbbb5f6d94863680b33d188b':
Support preferred activities with zero or one scheme in the filter
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions