diff options
| author | Prashant Malani <pmalani@google.com> | 2015-06-26 23:15:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-26 23:15:29 +0000 |
| commit | 2532c9e63b3dfc98a9c32a5cc389ed16da1950e3 (patch) | |
| tree | 3ac53620a65fdbd96a8e9945dadf100d233c1405 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e96199b733a412c6289d50316a046d7c42309cba (diff) | |
| parent | b29eeb5af148097bf55c22a4ce3b040ad2ecc792 (diff) | |
am b29eeb5a: am b3d02465: am 9a3eacbe: Merge "Revert "Always re-establish kernel alarms when considering new alarm set"" into cw-d-mr1-dev
* commit 'b29eeb5af148097bf55c22a4ce3b040ad2ecc792':
Revert "Always re-establish kernel alarms when considering new alarm set"
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions