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