diff options
| author | Prashant Malani <pmalani@google.com> | 2015-06-11 23:52:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-11 23:52:49 +0000 |
| commit | 327b481f1f2499eaa5ab938e63a2c12c21fe7482 (patch) | |
| tree | 95252960bc49db59dd72c319fe9c57907ebef6d2 /rs/java/android/renderscript/ProgramRaster.java | |
| parent | 88bc9753c30c9ab3c92d074ae49520cfa2258b16 (diff) | |
| parent | 786cd12f785374f93c19c909687ea300e41ffbc2 (diff) | |
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 '786cd12f785374f93c19c909687ea300e41ffbc2':
DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"
Diffstat (limited to 'rs/java/android/renderscript/ProgramRaster.java')
0 files changed, 0 insertions, 0 deletions