diff options
| author | bsears <bsears@google.com> | 2019-07-23 23:49:24 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-23 23:49:24 -0700 |
| commit | 22fa938e876f0c80e145d01512d5096af8c50c22 (patch) | |
| tree | bd83b3bc633271a6705130c0b0acd25d59fc616b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3d00facef8b12c58fddc7e6f622da9fcf5209d02 (diff) | |
| parent | afa393565dc7d99eb5a9da95ed84f39578584c4a (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: afa393565d -s ours
am skip reason: change_id If39777340b72bc623d6690bc4f784c7f5c26ea8d with SHA1 dc8fee7ea1 is in history
Change-Id: I887499107bc30f295f2b63567a90ffcd0b423433
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions