diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-08-14 00:09:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-14 00:09:01 +0000 |
| commit | 7453a0aa2cf3dabb7390dec56dd4523053f20330 (patch) | |
| tree | 64b16e2f194aa1e47d05c44dccb297dd9eb15e5f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d6fb8958d2baccffb176ae75c657963212726e79 (diff) | |
| parent | 587488e027c41394dc6a1f2248c4dbe8d3530b69 (diff) | |
am 587488e0: am 81eeef58: Merge "Update time when turning on screen, in addition to waking up" into mnc-dev
* commit '587488e027c41394dc6a1f2248c4dbe8d3530b69':
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