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