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