diff options
| author | Bart Sears <bsears@google.com> | 2015-08-13 05:51:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-13 05:51:48 +0000 |
| commit | a35ada4846d3794408825c10ee8a6070a1590044 (patch) | |
| tree | 19a5c6299bc7dfd7be9e78674cace507bbdfa275 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4846c62aa31dd7f60608199b2b63b7bf8bf0a0c0 (diff) | |
| parent | 3ab3ffc646f311f03f464e175f0d4f73c79c0d68 (diff) | |
am 3ab3ffc6: am b7ae1990: am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev
* commit '3ab3ffc646f311f03f464e175f0d4f73c79c0d68':
Fix Keyguard drawn timeout
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions