diff options
| author | bsears <bsears@google.com> | 2019-07-23 21:56:20 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-23 21:56:20 -0700 |
| commit | a00fdf2419b851ac30d226a0ac8eab9508afc851 (patch) | |
| tree | c5c929a2c47f917c8c8b00c2c251b4e2bf4375a2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4679e7efa5f7f0b9c855b5a499d12b764ec7ac3f (diff) | |
| parent | 88c506fd141dfe3089ee081dffd94ecda43a6265 (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 skip reason: change_id If39777340b72bc623d6690bc4f784c7f5c26ea8d with SHA1 dc8fee7ea1 is in history
Change-Id: I31150cc44df139919be71064008a7e7a325831db
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions