diff options
| author | Elliott Hughes <enh@google.com> | 2014-04-24 09:01:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-24 09:01:44 +0000 |
| commit | 56cc5ba79bdf75a73281dc73f13169a409d96c28 (patch) | |
| tree | f25ddc190d7b4e268f4235b2e2dba1b9d1b9d3a0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8f9d92c4ca5233607ca01dac0b3b66fde5539307 (diff) | |
| parent | 8d47f23e43760dcbf051aaeffff668c3c6340276 (diff) | |
am 8d47f23e: am dbb0de21: Merge "Fix a typo in an assertion."
* commit '8d47f23e43760dcbf051aaeffff668c3c6340276':
Fix a typo in an assertion.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions