diff options
| author | Matthew Williams <mjwilliams@google.com> | 2015-08-10 23:05:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-10 23:05:27 +0000 |
| commit | ced03081ef5627e123b26a0a7c1b3fd95210f261 (patch) | |
| tree | 5552437e5b4876f8bb2169c0825536e25b533b29 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 863676ef7f30080a1b88633c7c75f71f91150dbd (diff) | |
| parent | ae88437d292f253f2bdea16cbe381e0ae46b15ab (diff) | |
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 'ae88437d292f253f2bdea16cbe381e0ae46b15ab':
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