diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-08-13 01:18:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-13 01:18:24 +0000 |
| commit | d5b3a35c14130deba54d9e72a10cce16adf7b99b (patch) | |
| tree | 6a724520ae12c7e4bd3f5146b7707fbc94ed38df /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 80581f7a65e3e365f2fa311196ff080c9308b733 (diff) | |
| parent | 5f3af1449aa9a86768f7768c14eaeba927733c91 (diff) | |
am 5f3af144: am d59f5c02: am a78181b6: Merge "Fix touch-to-wake while dozing" into mnc-dr-dev
* commit '5f3af1449aa9a86768f7768c14eaeba927733c91':
Fix touch-to-wake while dozing
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions
