diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-02-05 23:07:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-05 23:07:46 +0000 |
| commit | 02cc7e2204efe586cfd6b4391ee07d7b7e29fe6a (patch) | |
| tree | 30d6889d808b4b00ba767f5368f241f0b799a3bd /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 41908a2faabdb9434532b89e8b4726d2a3d42c9c (diff) | |
| parent | 4fdac61388bd25a4a5bf6caef5bee0360e48ab51 (diff) | |
am 4fdac613: am 5c2fdc33: Merge "Always re-establish kernel alarms when considering new alarm set" into lmp-mr1-dev automerge: 29039a2
* commit '4fdac61388bd25a4a5bf6caef5bee0360e48ab51':
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