diff options
author | Jeff Brown <jeffbrown@google.com> | 2014-03-14 16:35:51 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 16:35:51 +0000 |
commit | 5988ea8c2278fb2d042d2ad2459fb647d962f71f (patch) | |
tree | 354649670028b453388e0c564e744da39ed9a59f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 86dbccae5e3481892e0b9ea5de8d5d042d5cb1ba (diff) | |
parent | 88768cc35789638f16b5a1a9c9de99eb4f6cd408 (diff) |
am 88768cc3: am 6adc9602: am 825dd9dd: am 73bd57f7: Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev
* commit '88768cc35789638f16b5a1a9c9de99eb4f6cd408':
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