diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-12-14 18:24:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-14 18:24:45 +0000 |
| commit | 3039f42e67e7dd03c65571801d2ef055e5e9f1a0 (patch) | |
| tree | 35e339a557d86abc6b3233818723303f8270d843 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 13b2cfdfdfe53dfeb1a6b6638965ca642f896161 (diff) | |
| parent | eb9e0555f4dae1a29b223acb78479bf6febf6f9a (diff) | |
Merge "DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours am: 589f83e686 -s ours am: 495aa09cc6 -s ours am: 10a9005003 -s ours am: 03c946e06b -s ours am: c2aed112a7 -s ours am: a481fd31cf -s ours" into nyc-mr2-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions