diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-07-24 05:57:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-07-24 05:57:08 +0000 |
| commit | afa393565dc7d99eb5a9da95ed84f39578584c4a (patch) | |
| tree | aebd3f31117e733bee1932ddc8ae40bdae987aed /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1fca79b7668aa5371ad9a1a43861a76f78141000 (diff) | |
| parent | 16efee10d9b4fb5fa87f0638df1e56476da2db48 (diff) | |
Merge "[automerger skipped] Merge "Don't animate clock when turning screen off." into qt-dev am: 486503c74e -s ours am: c7067c4d5d -s ours am: 4d1c56c7fd -s ours am skip reason: change_id If39777340b72bc623d6690bc4f784c7f5c26ea8d with SHA1 dc8fee7ea1 is in history" into qt-qpr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions