diff options
| author | Prashant Malani <pmalani@google.com> | 2015-06-15 14:37:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-15 14:37:21 +0000 |
| commit | 8fdeda3d3af44a0fcaa472af171a1dc09d4e0529 (patch) | |
| tree | db864862cbf4351a10e6853863a63abde019451e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | fc41fe263995069eb80bf1dd797e34532ce2ff1b (diff) | |
| parent | 6a7fdbddf7f7cec3ce511994b05eaeb94d18da6a (diff) | |
am 6a7fdbdd: (-s ours) am a8cff2ac: (-s ours) am 327b481f: (-s ours) am 786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev
* commit '6a7fdbddf7f7cec3ce511994b05eaeb94d18da6a':
DO NOT MERGE ANYWHERE 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