diff options
| author | Jeff Brown <jeffbrown@google.com> | 2014-04-09 09:17:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-09 09:17:10 +0000 |
| commit | 50807c178f8d491637cc3f7c83161258a9374ed7 (patch) | |
| tree | 31fe2fe49ce9cb430ac1acd1fe3c07b88df7f186 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c03dea76307163b95a313ba3e887aa94ed01dc2c (diff) | |
| parent | 7f9599d63c892934c7f8a2e46d1e518ddb0d43df (diff) | |
am 7f9599d6: (-s ours) am ea72cdf2: Merge "Move display power controller to display manager service. (DO NOT MERGE)" into klp-modular-dev
* commit '7f9599d63c892934c7f8a2e46d1e518ddb0d43df':
Move display power controller to display manager service. (DO NOT MERGE)
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions