diff options
| author | Matthew Williams <mjwilliams@google.com> | 2015-08-10 23:13:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-10 23:13:40 +0000 |
| commit | 8ca3e7da89b526a7ef8dbcf22defe408aec137b6 (patch) | |
| tree | 16c4daff8a887a9a01bb6c4d4c114ba37660cca9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 590fb3e066fadc6925942c9a7c65276c9c79a70c (diff) | |
| parent | ced03081ef5627e123b26a0a7c1b3fd95210f261 (diff) | |
am ced03081: (-s ours) am ae88437d: am 83682890: am 2c8c251e: am 77d5b914: Merge "DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED" into mnc-dev
* commit 'ced03081ef5627e123b26a0a7c1b3fd95210f261':
DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions