diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-10-12 19:40:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-12 19:40:21 +0000 |
| commit | b8f8ca5139e3268c7447565940b63a543ebe9ed5 (patch) | |
| tree | e4cdb689c26ac10fb585d5f68f7721bce2625583 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 41bf75c606fa19b473bc87145f766757525ae96c (diff) | |
| parent | 651cb804b12614094c2b69a2133c8c0b2083556e (diff) | |
am 651cb804: am fe1934e4: Merge "RRO: idmap: allow flock(2) to block"
* commit '651cb804b12614094c2b69a2133c8c0b2083556e':
RRO: idmap: allow flock(2) to block
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions