diff options
author | Jeff Brown <jeffbrown@google.com> | 2014-03-14 16:31:59 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 16:31:59 +0000 |
commit | 88768cc35789638f16b5a1a9c9de99eb4f6cd408 (patch) | |
tree | 9aaa047d94df289cd8c66d4eee8c690692afd559 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 6d3d6c4a06a1e83d126622d8a971f439b80ec354 (diff) | |
parent | 6adc96020f763289d2e2a33b612f2ff237fb40b6 (diff) |
am 6adc9602: am 825dd9dd: am 73bd57f7: Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev
* commit '6adc96020f763289d2e2a33b612f2ff237fb40b6':
Retain display when creating specialized contexts. (DO NOT MERGE)
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions