diff options
| author | Adrian Roos <roosa@google.com> | 2015-07-23 21:48:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-23 21:48:42 +0000 |
| commit | aebb144b3c2651f19109c8f70f809e6e9f1a2e49 (patch) | |
| tree | a5a707093ae5974728114daa2f32bd7cdc6f902f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a083ef9a7b882a249928ed928adf6af61a525e37 (diff) | |
| parent | e674e9500c723848e896d281fc4bf45285689170 (diff) | |
am e674e950: am 9fb98375: am b30f841c: resolved conflicts for merge of c1244a29 to mnc-dr-dev
* commit 'e674e9500c723848e896d281fc4bf45285689170':
Touch, wake and unlock
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions