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