diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2016-02-22 19:27:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-22 19:27:18 +0000 |
| commit | 83fd156e2173ff65fd8afdaca1ccd20fc91a5d33 (patch) | |
| tree | 16eace3fc7a76b749ff7c9df5869bc42cbabcf56 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7f35fa7365b24f13f7553c452dc68f99fc7304ae (diff) | |
| parent | 3e439db8c829023645a54eee4cd531928bccb03d (diff) | |
Merge "DO NOT MERGE ANYWHERE: Don\'t change screen on time on time changes" into mnc-dr-dev
am: 3e439db8c8 -s ours
* commit '3e439db8c829023645a54eee4cd531928bccb03d':
DO NOT MERGE ANYWHERE: Don't change screen on time on time changes
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions