diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-08-13 23:58:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-13 23:58:29 +0000 |
| commit | 587488e027c41394dc6a1f2248c4dbe8d3530b69 (patch) | |
| tree | cc7ce05ac7482a5723c5d92cf74bb144e93faa77 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e41c18d629d65e302d4c40f2582845225da0d4f4 (diff) | |
| parent | 81eeef589386483722c21572d9ab6d3f95dd26be (diff) | |
am 81eeef58: Merge "Update time when turning on screen, in addition to waking up" into mnc-dev
* commit '81eeef589386483722c21572d9ab6d3f95dd26be':
Update time when turning on screen, in addition to waking up
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions