diff options
| author | John Spurlock <jspurlock@google.com> | 2014-12-04 21:45:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-04 21:45:26 +0000 |
| commit | c82144fd8fd2d6f240b17e7b47b41fe7e198b841 (patch) | |
| tree | 8462a8c5cc03fc505ff2fe9d4b9647c40d7055e3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 10f47f9233484763a8a0e0c8e36f68dd28056485 (diff) | |
| parent | 959312701f55c9d098403c332b88b5777daf4e4c (diff) | |
am 95931270: am 32b61ab2: Merge "Doze: Don\'t block pickup pulses on a proximity check." into lmp-mr1-dev
* commit '959312701f55c9d098403c332b88b5777daf4e4c':
Doze: Don't block pickup pulses on a proximity check.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions
