diff options
| author | Prashant Malani <pmalani@google.com> | 2015-06-15 15:00:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-15 15:00:43 +0000 |
| commit | 72ea672852e99d52e69275da664ae6090fc8f836 (patch) | |
| tree | 330583369be488fc323d05c45c965de503861883 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e3d8648ef0e155b7a3f2b3b03152982f490d9898 (diff) | |
| parent | 1e6c78e87203d73004be74c7a1e40e6b77c25dd6 (diff) | |
am 1e6c78e8: (-s ours) am 8fdeda3d: (-s ours) 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 '1e6c78e87203d73004be74c7a1e40e6b77c25dd6':
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