diff options
| author | bsears <bsears@google.com> | 2019-07-23 22:21:42 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-23 22:21:42 -0700 |
| commit | 87db6a1c27ca6fe8d2280f787026b31ac19f1d94 (patch) | |
| tree | f43d1725f3e7984cdf2c2f72abc26bdb960861cf /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3590f5d90680bc6d0964bf17d39515649cbab32d (diff) | |
| parent | a00fdf2419b851ac30d226a0ac8eab9508afc851 (diff) | |
[automerger skipped] Merge "Don't animate clock when turning screen off." into qt-dev am: 486503c74e am: 8cd2973a9f -s ours am: 88c506fd14 -s ours
am: a00fdf2419 -s ours
am skip reason: change_id If39777340b72bc623d6690bc4f784c7f5c26ea8d with SHA1 dc8fee7ea1 is in history
Change-Id: I9acdc0d8f7052f769d172529b0992ed9a02a1190
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions