diff options
| author | Matthew Williams <mjwilliams@google.com> | 2015-08-10 22:51:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-10 22:51:32 +0000 |
| commit | 83682890190c9a5b73e1742a58c1e017ac418ee2 (patch) | |
| tree | cbe49c8c123f8be5055697c9bf9e1f11b3bbb927 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1e05bc6f77b9e609df598ef0aed20a0ef81848a1 (diff) | |
| parent | 2c8c251e73a94ec934bbd5aefb49f2d1be866cdc (diff) | |
am 2c8c251e: am 77d5b914: Merge "DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED" into mnc-dev
* commit '2c8c251e73a94ec934bbd5aefb49f2d1be866cdc':
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